scsi: qla2xxx: don't disable a not previously enabled PCI device
authorJohannes Thumshirn <jthumshirn@suse.de>
Tue, 23 May 2017 14:50:47 +0000 (16:50 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 2 Nov 2017 06:16:26 +0000 (07:16 +0100)
commita72c279dfbfa5b6c5832f16960d8dce31f27645b
tree849deb9e4471ac6ad9bb4b919287de466cbe8ab3
parentf7eb769a8db069e8a999cea74457c24d813b7c38
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>
drivers/scsi/qla2xxx/qla_os.c