diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 10:03:42 +0200 |
| commit | 872d65f674a8a420fdfe656cd66d1fa8e60f41a7 (patch) | |
| tree | b2b88fba5b97213a8d8908a1fd9536cefc00e574 /sound/arm | |
| parent | d336905e00f208bcb89c719022c11dd3d976597a (diff) | |
| parent | b68b58fd6a341c2115ff5fb466fe9fc0b581980e (diff) | |
| download | linux-872d65f674a8a420fdfe656cd66d1fa8e60f41a7.tar.gz linux-872d65f674a8a420fdfe656cd66d1fa8e60f41a7.tar.bz2 linux-872d65f674a8a420fdfe656cd66d1fa8e60f41a7.zip | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 656e474dca47..91acc9a243ec 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -863,7 +863,6 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci) struct snd_ac97 *ac97; int ret; - writel(0, aaci->base + AC97_POWERDOWN); /* * Assert AACIRESET for 2us */ @@ -1047,7 +1046,11 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id) writel(0x1fff, aaci->base + AACI_INTCLR); writel(aaci->maincr, aaci->base + AACI_MAINCR); - + /* + * Fix: ac97 read back fail errors by reading + * from any arbitrary aaci register. + */ + readl(aaci->base + AACI_CSCH1); ret = aaci_probe_ac97(aaci); if (ret) goto out; |