aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/dmx3191d.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/dmx3191d.c')
-rw-r--r--drivers/scsi/dmx3191d.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 5101328656b8..6e1960a88270 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -100,7 +100,7 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
100 */ 100 */
101 printk(KERN_WARNING "dmx3191: IRQ %d not available - " 101 printk(KERN_WARNING "dmx3191: IRQ %d not available - "
102 "switching to polled mode.\n", pdev->irq); 102 "switching to polled mode.\n", pdev->irq);
103 shost->irq = SCSI_IRQ_NONE; 103 shost->irq = NO_IRQ;
104 } 104 }
105 105
106 pci_set_drvdata(pdev, shost); 106 pci_set_drvdata(pdev, shost);
@@ -113,7 +113,8 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
113 return 0; 113 return 0;
114 114
115 out_free_irq: 115 out_free_irq:
116 free_irq(shost->irq, shost); 116 if (shost->irq != NO_IRQ)
117 free_irq(shost->irq, shost);
117 out_release_region: 118 out_release_region:
118 release_region(io, DMX3191D_REGION_LEN); 119 release_region(io, DMX3191D_REGION_LEN);
119 out_disable_device: 120 out_disable_device:
@@ -130,7 +131,7 @@ static void dmx3191d_remove_one(struct pci_dev *pdev)
130 131
131 NCR5380_exit(shost); 132 NCR5380_exit(shost);
132 133
133 if (shost->irq != SCSI_IRQ_NONE) 134 if (shost->irq != NO_IRQ)
134 free_irq(shost->irq, shost); 135 free_irq(shost->irq, shost);
135 release_region(shost->io_port, DMX3191D_REGION_LEN); 136 release_region(shost->io_port, DMX3191D_REGION_LEN);
136 pci_disable_device(pdev); 137 pci_disable_device(pdev);