diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2017-05-23 14:50:47 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-14 13:06:02 (GMT) |
| commit | fe42472e53ebceec5fbb8611a4b4946c1a2e5c01 (patch) | |
| tree | 40d52e964e46369d4de23db730d15d62869ac2a1 /sound/arm | |
| parent | f75e09ebd3e414e3a1be5a11492702346d102489 (diff) | |
| download | linux-fe42472e53ebceec5fbb8611a4b4946c1a2e5c01.tar.xz | |
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")
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/arm')
0 files changed, 0 insertions, 0 deletions