From 8015e3defe491d305b20c2e64b154b999e6da065 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Mon, 19 Dec 2011 17:57:52 +0800 Subject: ALSA: atmel/ac97c: using software reset instead hardware reset if not available Signed-off-by: Bo Shen Acked-by: Nicolas Ferre Signed-off-by: Takashi Iwai --- sound/atmel/ac97c.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sound') diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 6e5addeb236b..73516f69ac7c 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -899,6 +899,10 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip) /* AC97 v2.2 specifications says minimum 1 us. */ udelay(2); gpio_set_value(chip->reset_pin, 1); + } else { + ac97c_writel(chip, MR, AC97C_MR_WRST | AC97C_MR_ENA); + udelay(2); + ac97c_writel(chip, MR, AC97C_MR_ENA); } } -- cgit v1.2.3 From 990fc3d0b2c27a9633b8f4566273da60aebe5941 Mon Sep 17 00:00:00 2001 From: Joachim Eastwood Date: Fri, 23 Dec 2011 17:32:25 +0100 Subject: ASoC: wm8776: add missing break in sample size switch Broken in commit d1dc698a54259cb454284456483b45f67c865cf8 Signed-off-by: Joachim Eastwood Signed-off-by: Mark Brown --- sound/soc/codecs/wm8776.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sound') diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index bfdc52370ad0..d3b0a20744f1 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -235,6 +235,7 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, switch (snd_pcm_format_width(params_format(params))) { case 16: iface = 0; + break; case 20: iface = 0x10; break; -- cgit v1.2.3