diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2017-05-23 16:50:47 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-11-06 15:30:24 +0100 |
| commit | 34caf4c4d9afb81cb155738a9fd17c41434ba9b2 (patch) | |
| tree | aebc2b40453b8db5b75419e6defa5624e55077e5 /scripts/patch-kernel | |
| parent | b359b6cbb74b0e194795533f9245d419dbfeca3c (diff) | |
scsi: qla2xxx: don't disable a not previously enabled PCI device
commit ddff7ed45edce4a4c92949d3c61cd25d229c4a14 upstream.
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: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring")
Cc: <stable@vger.kernel.org>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Giridhar Malavali <giridhar.malavali@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions