1 files changed, 7 insertions, 1 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 24d3013c023..7c1fc64cb53 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -50,7 +50,11 @@ static void aaci_ac97_select_codec(struct aaci *aaci, struct snd_ac97 *ac97)
         if (v & SLFR_1RXV)
                 readl(aaci->base + AACI_SL1RX);
 
-        writel(maincr, aaci->base + AACI_MAINCR);
+        if (maincr != readl(aaci->base + AACI_MAINCR)) {
+                writel(maincr, aaci->base + AACI_MAINCR);
+                readl(aaci->base + AACI_MAINCR);
+                udelay(1);
+        }
 }
 
 /*
@@ -993,6 +997,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
          * disabling the channel doesn't clear the FIFO.
          */
         writel(aaci->maincr & ~MAINCR_IE, aaci->base + AACI_MAINCR);
+        readl(aaci->base + AACI_MAINCR);
+        udelay(1);
         writel(aaci->maincr, aaci->base + AACI_MAINCR);
 
         /*