linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / isa / opti9xx / opti92x-ad1848.c

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 9d528ae..65b28cb 100644 (file)
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1291,7 +1291,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip,
        }
        codec->dma2 = chip->dma2;
 
-       if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) {
+       if (request_irq(chip->irq, snd_opti93x_interrupt, SA_INTERRUPT, DRIVER_NAME" - WSS", codec)) {
                snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
                snd_opti93x_free(codec);
                return -EBUSY;
@@ -1863,7 +1863,7 @@ static int __init snd_opti9xx_probe(struct snd_card *card)
                rmidi = NULL;
        else
                if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                               chip->mpu_port, 0, chip->mpu_irq, IRQF_DISABLED,
+                               chip->mpu_port, 0, chip->mpu_irq, SA_INTERRUPT,
                                &rmidi)))
                        snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
                                   chip->mpu_port);
@@ -2099,11 +2099,8 @@ static int __init alsa_card_opti9xx_init(void)
                        return error;
                device = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
                if (!IS_ERR(device)) {
-                       if (platform_get_drvdata(device)) {
-                               snd_opti9xx_platform_device = device;
-                               return 0;
-                       }
-                       platform_device_unregister(device);
+                       snd_opti9xx_platform_device = device;
+                       return 0;
                }
                platform_driver_unregister(&snd_opti9xx_driver);
        }