|
@@ -3035,9 +3035,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
base_vha = qla2x00_create_host(sht, ha);
|
|
|
if (!base_vha) {
|
|
|
ret = -ENOMEM;
|
|
|
- qla2x00_mem_free(ha);
|
|
|
- qla2x00_free_req_que(ha, req);
|
|
|
- qla2x00_free_rsp_que(ha, rsp);
|
|
|
goto probe_hw_failed;
|
|
|
}
|
|
|
|
|
@@ -3098,7 +3095,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
/* Set up the irqs */
|
|
|
ret = qla2x00_request_irqs(ha, rsp);
|
|
|
if (ret)
|
|
|
- goto probe_init_failed;
|
|
|
+ goto probe_hw_failed;
|
|
|
|
|
|
/* Alloc arrays of request and response ring ptrs */
|
|
|
if (!qla2x00_alloc_queues(ha, req, rsp)) {
|
|
@@ -3415,6 +3412,9 @@ probe_failed:
|
|
|
scsi_host_put(base_vha->host);
|
|
|
|
|
|
probe_hw_failed:
|
|
|
+ qla2x00_mem_free(ha);
|
|
|
+ qla2x00_free_req_que(ha, req);
|
|
|
+ qla2x00_free_rsp_que(ha, rsp);
|
|
|
qla2x00_clear_drv_active(ha);
|
|
|
|
|
|
iospace_config_failed:
|