Skip to contentSkip to conversation

ASoC updates for v3.14

DISCUSSION Mark Brown 2 participants 2 messages Jan 20, 2014

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

The following changes since commit 258753361534a40ad7180c742da813fc659e427b:

Merge branch 'for-next' into for-linus (2014-01-20 10:20:14 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.14-3

for you to fetch changes up to ac6d7c48e3a5e82e876114b9ca0b489e96997743:

Merge remote-tracking branch 'asoc/topic/compress' into asoc-next (2014-01-20 11:50:41 +0000)

----------------------------------------------------------------

ASoC: Last updates for the merge window

A couple more fixes plus some extensions to DPCM for use with compressed audio from Liam which arrived just after my previous pull request.

----------------------------------------------------------------
Arun Shamanna Lakshmi (1):
ASoC: dapm: Fix double prefix addition

Liam Girdwood (2):
ASoC: DPCM: make some DPCM API calls non static for compressed usage
ASoC: compress: Add suport for DPCM into compressed audio

Mark Brown (3):
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/compress' into asoc-next

Xiubo Li (1):

      ASoC: core: Fix possible NULL pointer dereference of pcm->config
 include/sound/soc-dpcm.h              |  22 +++
 include/sound/soc.h                   |   1 +
 sound/soc/soc-compress.c              | 301 +++++++++++++++++++++++++++++++++-
 sound/soc/soc-dapm.c                  |  11 +-
 sound/soc/soc-generic-dmaengine-pcm.c |   9 +-
 sound/soc/soc-pcm.c                   |  29 ++--
 6 files changed, 347 insertions(+), 26 deletions(-)
#1 lore raw

At Mon, 20 Jan 2014 14:46:38 +0000,

Quoted 12 lines · Mark Brown

The following changes since commit 258753361534a40ad7180c742da813fc659e427b:

Merge branch 'for-next' into for-linus (2014-01-20 10:20:14 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.14-3

for you to fetch changes up to ac6d7c48e3a5e82e876114b9ca0b489e96997743:

Quoted 8 lines

Merge remote-tracking branch 'asoc/topic/compress' into asoc-next (2014-01-20 11:50:41 +0000)

----------------------------------------------------------------

ASoC: Last updates for the merge window

A couple more fixes plus some extensions to DPCM for use with compressed audio from Liam which arrived just after my previous pull request.

Thanks, pulled now.

Meanwhile, I casually hit a build error when CONFIG_OF=n. A fix patch is below. The problematic commit has been already in 3.13, so it's not new by this pull request, though.

Takashi

-- 8< --
From: Takashi Iwai <[email protected]>
Subject: [PATCH] ASoC: samsung: Fix compile error when CONFIG_OF=n

Remove the superfluous ifdef CONFIG_OF that leads to a build error.
sound/soc/samsung/smdk_wm8994.c: In function 'smdk_audio_probe':
sound/soc/samsung/smdk_wm8994.c:191:23: error: 'samsung_wm8994_of_match' undeclared (first use in this function)

---
 sound/soc/samsung/smdk_wm8994.c | 2 --
 1 file changed, 2 deletions(-)
sound/soc/samsung/smdk_wm8994.c +0 -2
index b072bd107b31..15fc4bfd6307 100644
@@ -152,13 +152,11 @@ static struct snd_soc_card smdk = {
 	.num_links = ARRAY_SIZE(smdk_dai),
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id samsung_wm8994_of_match[] = {
 	{ .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data },
 	{},
 };
 MODULE_DEVICE_TABLE(of, samsung_wm8994_of_match);
-#endif /* CONFIG_OF */
 
 static int smdk_audio_probe(struct platform_device *pdev)
 {
Signature · 1 line
1.8.5.2