Commit eecbbd83 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Sasha Levin

scsi: qla2xxx: don't disable a not previously enabled PCI device

[ Upstream commit ddff7ed4 ]

When pci_enable_device() or pci_enable_device_mem() fail in
qla2x00_probe_one() we bail out but do a call to
pci_disable_device(). This causes the dev_WARN_ON() in
pci_disable_device() to trigger, as the device wasn't enabled
previously.

So instead of taking the 'probe_out' error path we can directly return
*iff* one of the pci_enable_device() calls fails.

Additionally rename the 'probe_out' goto label's name to the more
descriptive 'disable_device'.
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Fixes: e315cd28 ("[SCSI] qla2xxx: Code changes for qla data structure refactoring")
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarGiridhar Malavali <giridhar.malavali@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 4a213a0f
...@@ -2313,10 +2313,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2313,10 +2313,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (mem_only) { if (mem_only) {
if (pci_enable_device_mem(pdev)) if (pci_enable_device_mem(pdev))
goto probe_out; return ret;
} else { } else {
if (pci_enable_device(pdev)) if (pci_enable_device(pdev))
goto probe_out; return ret;
} }
/* This may fail but that's ok */ /* This may fail but that's ok */
...@@ -2326,7 +2326,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2326,7 +2326,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (!ha) { if (!ha) {
ql_log_pci(ql_log_fatal, pdev, 0x0009, ql_log_pci(ql_log_fatal, pdev, 0x0009,
"Unable to allocate memory for ha.\n"); "Unable to allocate memory for ha.\n");
goto probe_out; goto disable_device;
} }
ql_dbg_pci(ql_dbg_init, pdev, 0x000a, ql_dbg_pci(ql_dbg_init, pdev, 0x000a,
"Memory allocated for ha=%p.\n", ha); "Memory allocated for ha=%p.\n", ha);
...@@ -2924,7 +2924,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2924,7 +2924,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
kfree(ha); kfree(ha);
ha = NULL; ha = NULL;
probe_out: disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
return ret; return ret;
} }
......
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