diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 08:37:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 08:37:14 +0100 |
| commit | e38302f78284e3e80ffc2eef54001fce7d183bd4 (patch) | |
| tree | 0cb61d52ca9d11d446e3fc1bc97d8fd92ab1e934 /sound/pci/oxygen/oxygen_io.c | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
| parent | c386735264da97e6b6d15aa56361e9ef188b26ab (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/oxygen/oxygen_io.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c index 09b2b2a36df..f5164b1e1c8 100644 --- 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; } |