[GIT PULL] sound fix for 3.2-rc7

From: Takashi Iwai
Date: Wed Dec 21 2011 - 10:45:22 EST


Linus,

please pull a sound fix for v3.2-rc7 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus

The topmost commit is 8015e3defe491d305b20c2e64b154b999e6da065

Only a single commit at this time. A good sign, isn't it?


Thanks!

Takashi

===

Bo Shen (1):
ALSA: atmel/ac97c: using software reset instead hardware reset if not available

---
sound/atmel/ac97c.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 6e5adde..73516f6 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);
}
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/