aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohn Soni Jose <sony.john-n@emulex.com>2015-02-12 06:45:47 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-19 10:11:09 +0200
commitc9fda3f26cd849651cd4592d910a211979e3bff6 (patch)
tree656cb0358e4afa8b21e93e1860a8e7f4e9d2a54b /drivers
parentdb6312ab779380004590b29612ce84af981ca374 (diff)
downloadlinux-linaro-stable-c9fda3f26cd849651cd4592d910a211979e3bff6.tar.gz
be2iscsi: Fix kernel panic when device initialization fails
commit 2e7cee027b26cbe7e6685a7a14bd2850bfe55d33 upstream. Kernel panic was happening as iscsi_host_remove() was called on a host which was not yet added. Signed-off-by: John Soni Jose <sony.john-n@emulex.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <JBottomley@Odin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/be2iscsi/be_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 953bd0bfdf0d..19ddd43a00cf 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5684,9 +5684,9 @@ free_port:
hba_free:
if (phba->msix_enabled)
pci_disable_msix(phba->pcidev);
- iscsi_host_remove(phba->shost);
pci_dev_put(phba->pcidev);
iscsi_host_free(phba->shost);
+ pci_set_drvdata(pcidev, NULL);
disable_pci:
pci_disable_device(pcidev);
return ret;