Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / sound / pci / es1968.c

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index f8f3bb662d1726ac0b7c516d630bc55a3f1536f2..1bf298d214b90462cfe7b5253c7d4d0f6c097fd1 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1840,9 +1840,8 @@ static void snd_es1968_suppress_jitter(struct es1968 *chip, struct esschan *es)
        cp2 = __apu_get_register(chip, 1, 5);
        diff = (cp1 > cp2 ? cp1 - cp2 : cp2 - cp1);
 
-       if (diff > 1) {
+       if (diff > 1)
                __maestro_write(chip, IDR0_DATA_PORT, cp1);
-       }
 }
 
 /*
@@ -2476,7 +2475,8 @@ static inline void snd_es1968_free_gameport(struct es1968 *chip) { }
 static int snd_es1968_free(struct es1968 *chip)
 {
        if (chip->io_port) {
-               synchronize_irq(chip->irq);
+               if (chip->irq >= 0)
+                       synchronize_irq(chip->irq);
                outw(1, chip->io_port + 0x04); /* clear WP interrupts */
                outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
        }