diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 18:29:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 18:29:05 -0800 |
| commit | d5ed5e48f4a6333cde05c5235b88a8a94e72afe8 (patch) | |
| tree | 270824153a912b24b6402ad7e18658b54be4a643 /sound | |
| parent | 0703c680f62cb210fecf24684cc1c6a70c26c899 (diff) | |
| parent | 8015e3defe491d305b20c2e64b154b999e6da065 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: atmel/ac97c: using software reset instead hardware reset if not available
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 6e5addeb236..73516f69ac7 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); } } |