[ALSA] oxygen: use AC97 interrupt

[linux-2.6-omap-h63xx.git] / sound / pci / oxygen / oxygen_io.c

diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index d0cdce041dd800b589eb1e9a649191c1793a0044..74e23ef9c9467aaf3a54bacb2beb7315a4d36ea8 100644 (file)
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -85,14 +85,22 @@ EXPORT_SYMBOL(oxygen_write32_masked);
 
 static int oxygen_ac97_wait(struct oxygen *chip, unsigned int mask)
 {
-       unsigned long timeout = jiffies + msecs_to_jiffies(1);
-       do {
-               udelay(5);
-               cond_resched();
-               if (oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS) & mask)
-                       return 0;
-       } while (time_after_eq(timeout, jiffies));
-       return -EIO;
+       u8 status = 0;
+
+       /*
+        * Reading the status register also clears the bits, so we have to save
+        * the read bits in status.
+        */
+       wait_event_timeout(chip->ac97_waitqueue,
+                          ({ status |= oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS);
+                             status & mask; }),
+                          msecs_to_jiffies(1) + 1);
+       /*
+        * Check even after a timeout because this function should not require
+        * the AC'97 interrupt to be enabled.
+        */
+       status |= oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS);
+       return status & mask ? 0 : -EIO;
 }
 
 /*