merge 2.6.13-rc4 with ACPI's to-linus tree

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index a09b0fb49e81..29d89bfba0a4 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -472,6 +472,7 @@ void snd_trident_write_voice_regs(trident_t * trident,
                 break;
         default:
                 snd_BUG();
+                return;
         }
 
         outb(voice->number, TRID_REG(trident, T4D_LFO_GC_CIR));
@@ -3152,8 +3153,7 @@ static int snd_trident_gameport_open(struct gameport *gameport, int mode)
         switch (mode) {
                 case GAMEPORT_MODE_COOKED:
                         outb(GAMEPORT_MODE_ADC, TRID_REG(chip, GAMEPORT_GCR));
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1 + 20 * HZ / 1000); /* 20msec */
+                        msleep(20);
                         return 0;
                 case GAMEPORT_MODE_RAW:
                         outb(0, TRID_REG(chip, GAMEPORT_GCR));