From e4bc0bfc12b5781808115eab194013381217f689 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Tue, 10 Oct 2006 18:44:29 +0100 Subject: [PATCH] --- yaml --- r: 47064 b: refs/heads/master c: e40a0b2e9d73c69e6b9e5d55eb56696f81fbf802 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/emu10k1/emumixer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35ed01de7ca9..12d9fa6e9d3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0dbdaea55d55c05be972cd2a040acfa073b0509 +refs/heads/master: e40a0b2e9d73c69e6b9e5d55eb56696f81fbf802 diff --git a/trunk/sound/pci/emu10k1/emumixer.c b/trunk/sound/pci/emu10k1/emumixer.c index a118fee11cdd..5ceb8dd5cb38 100644 --- a/trunk/sound/pci/emu10k1/emumixer.c +++ b/trunk/sound/pci/emu10k1/emumixer.c @@ -542,7 +542,7 @@ static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol, snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_44K | EMU_HANA_DOCK_LEDS_2_LOCK ); /* Allow DLL to settle */ - udelay(10000); + msleep(10); /* Unmute all */ snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE ); break; @@ -559,7 +559,7 @@ static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol, snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_48K | EMU_HANA_DOCK_LEDS_2_LOCK ); /* Allow DLL to settle */ - udelay(10000); + msleep(10); /* Unmute all */ snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE ); break;