Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-block.git] / sound / pci / echoaudio / echoaudio_3g.c

diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c
index 9f439ea459f4a552dacd0b844919e017cadd16f9..52a933189576ad5a2f1060347af38dc5d88786d7 100644 (file)
--- a/sound/pci/echoaudio/echoaudio_3g.c
+++ b/sound/pci/echoaudio/echoaudio_3g.c
@@ -233,8 +233,8 @@ static int load_asic(struct echoaudio *chip)
 
        chip->asic_code = &card_fw[FW_3G_ASIC];
 
-       /* Now give the new ASIC a little time to set up */
-       mdelay(2);
+       /* Now give the new ASIC some time to set up */
+       msleep(1000);
        /* See if it worked */
        box_type = check_asic_status(chip);