From eb7a1698d24783dd215cb86a12cadebe9b4e7046 Mon Sep 17 00:00:00 2001 From: Johannes Dickgreber Date: Wed, 3 Oct 2007 13:22:19 +0200 Subject: [PATCH] [SCSI] qla1280: uses wrong failure path after failed pci_set_dma_mask A failure here wouldn't currently free the irq; go to the irq free path instead. Signed-off-by: Johannes Dickgreber Acked-by: Jes Sorensen Signed-off-by: James Bottomley --- drivers/scsi/qla1280.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 76089cf55f4..3aeb68bcb7a 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -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 -- 2.20.1