Skip to contentSkip to conversation

ALSA: cs4236: fix pnp_irq() error handling

PATCH In review Dan Carpenter 1 participant 1 message Nov 7, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 ALSA: cs4236: fix pnp_irq() error handling

pnp_irq() returns an unsigned value so the error handling here doesn't work. I recently introduced a IORESOURCE_INVALID define to make this less confusing.

---
This needs [patch 1/2] or it won't compile. Can both patches go through Andrew's tree?

sound/isa/cs423x/cs4236.c +2 -1
index 69614ac..9725843 100644
@@ -293,7 +293,8 @@ static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 	} else {
 		mpu_port[dev] = pnp_port_start(pdev, 0);
 		if (mpu_irq[dev] >= 0 &&
-		    pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {
+		    pnp_irq_valid(pdev, 0) &&
+		    pnp_irq(pdev, 0) != IORESOURCE_INVALID) {
 			mpu_irq[dev] = pnp_irq(pdev, 0);
 		} else {
 			mpu_irq[dev] = -1;	/* disable interrupt */