Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / pci / oxygen / oxygen_io.c

diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index 09b2b2a36df5200f35e75af487673a6ea9e215ce..f5164b1e1c80bd1c11b695425175af98ce74185c 100644 (file)
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -197,11 +197,11 @@ void oxygen_write_spi(struct oxygen *chip, u8 control, unsigned int data)
 {
        unsigned int count;
 
-       /* should not need more than 7.68 us (24 * 320 ns) */
+       /* should not need more than 30.72 us (24 * 1.28 us) */
        count = 10;
        while ((oxygen_read8(chip, OXYGEN_SPI_CONTROL) & OXYGEN_SPI_BUSY)
               && count > 0) {
-               udelay(1);
+               udelay(4);
                --count;
        }