Merge branch 'merge' into powerpc-next

[linux-2.6] / sound / pci / azt3328.c

diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index be87d3113ee406720163abc9b249252e59b4776d..5f63af6b88a29d35c1c906b6e1e34d88f07780a8 100644 (file)
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1514,7 +1514,8 @@ snd_azf3328_free(struct snd_azf3328 *chip)
        /* well, at least we know how to disable the timer IRQ */
        snd_azf3328_codec_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x00);
 
-        synchronize_irq(chip->irq);
+       if (chip->irq >= 0)
+               synchronize_irq(chip->irq);
 __end_hw:
        snd_azf3328_free_joystick(chip);
         if (chip->irq >= 0)