aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-11 08:03:37 -0500
committerTakashi Iwai <tiwai@suse.de>2013-02-11 08:03:37 -0500
commit83048ea7b1d11f5e560dea53873fb51d860202eb (patch)
tree5cc41aa9c2999188d3148e8828d44c4724115f5e /sound/soc/soc-dapm.c
parente9a25e04b845aade311aaa268a696c5c4ff3eece (diff)
parent699ba4546cfe3f4eee73aff4f307bf16362f9232 (diff)
Merge tag 'asoc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.9 A fairly quiet release for ASoC: - Support for a wider range of hardware in the compressed stream code. - The ability to mute capture streams as well as playback streams while inactive. - DT support for AK4642, FSI, Samsung I2S and WM8962. - AC'97 support for Tegra. - New driver for max98090, replacing the stub which was there. Due to dependencies we've also got support for asynchronous I/O in regmap and DTification of DMA support for Samsung platforms (used only by the I2S driver and SPI) merged here as well.
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 258acadb9e7d..1d6a9b3ceb27 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3255,14 +3255,16 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
3255 break; 3255 break;
3256 3256
3257 case SND_SOC_DAPM_POST_PMU: 3257 case SND_SOC_DAPM_POST_PMU:
3258 ret = snd_soc_dai_digital_mute(sink, 0); 3258 ret = snd_soc_dai_digital_mute(sink, 0,
3259 SNDRV_PCM_STREAM_PLAYBACK);
3259 if (ret != 0 && ret != -ENOTSUPP) 3260 if (ret != 0 && ret != -ENOTSUPP)
3260 dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret); 3261 dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret);
3261 ret = 0; 3262 ret = 0;
3262 break; 3263 break;
3263 3264
3264 case SND_SOC_DAPM_PRE_PMD: 3265 case SND_SOC_DAPM_PRE_PMD:
3265 ret = snd_soc_dai_digital_mute(sink, 1); 3266 ret = snd_soc_dai_digital_mute(sink, 1,
3267 SNDRV_PCM_STREAM_PLAYBACK);
3266 if (ret != 0 && ret != -ENOTSUPP) 3268 if (ret != 0 && ret != -ENOTSUPP)
3267 dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret); 3269 dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret);
3268 ret = 0; 3270 ret = 0;