]> err.no Git - linux-2.6/commitdiff
[SCSI] qla1280: uses wrong failure path after failed pci_set_dma_mask
authorJohannes Dickgreber <tanzy@gmx.de>
Wed, 3 Oct 2007 11:22:19 +0000 (13:22 +0200)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sun, 21 Oct 2007 15:53:02 +0000 (10:53 -0500)
A failure here wouldn't currently free the irq; go to the irq free
path instead.

Signed-off-by: Johannes Dickgreber <tanzy@gmx.de>
Acked-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/qla1280.c

index 76089cf55f4e956f857d7e3e123460d94c7923fe..3aeb68bcb7accce6ae3556a54fea2d66ab692ae5 100644 (file)
@@ -4310,7 +4310,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                        printk(KERN_WARNING "scsi(%li): Unable to set a "
                               "suitable DMA mask - aborting\n", ha->host_no);
                        error = -ENODEV;
-                       goto error_free_irq;
+                       goto error_put_host;
                }
        } else
                dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
@@ -4320,7 +4320,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                printk(KERN_WARNING "scsi(%li): Unable to set a "
                       "suitable DMA mask - aborting\n", ha->host_no);
                error = -ENODEV;
-               goto error_free_irq;
+               goto error_put_host;
        }
 #endif