Commit eb7a1698 authored by Johannes Dickgreber's avatar Johannes Dickgreber Committed by James Bottomley

[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: default avatarJohannes Dickgreber <tanzy@gmx.de>
Acked-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 05dd7ed2
...@@ -4310,7 +4310,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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 " printk(KERN_WARNING "scsi(%li): Unable to set a "
"suitable DMA mask - aborting\n", ha->host_no); "suitable DMA mask - aborting\n", ha->host_no);
error = -ENODEV; error = -ENODEV;
goto error_free_irq; goto error_put_host;
} }
} else } else
dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n", 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) ...@@ -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 " printk(KERN_WARNING "scsi(%li): Unable to set a "
"suitable DMA mask - aborting\n", ha->host_no); "suitable DMA mask - aborting\n", ha->host_no);
error = -ENODEV; error = -ENODEV;
goto error_free_irq; goto error_put_host;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment