[ALSA] cs4236-irq-handling-fix.patch

[linux-2.6.git] / sound / isa / cs423x / cs4236.c

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index e745a54e00a1be7269486ce86cb5396cb492ef95..39f4eff44f5c8c5ac8fb2dc7595ef2082325fe5e 100644 (file)
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -349,8 +349,7 @@ static int __devinit snd_card_cs4236_pnp(int dev, struct snd_card_cs4236 *acard,
                pnp_init_resource_table(cfg);
                if (mpu_port[dev] != SNDRV_AUTO_PORT)
                        pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2);
                pnp_init_resource_table(cfg);
                if (mpu_port[dev] != SNDRV_AUTO_PORT)
                        pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2);

-               if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0 &&
-                   pnp_irq_valid(pdev, 0))
+               if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0)

                        pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
                err = pnp_manual_config_dev(pdev, cfg, 0);
                if (err < 0)
                        pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
                err = pnp_manual_config_dev(pdev, cfg, 0);
                if (err < 0)