summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJohn Soni Jose <sony.john-n@emulex.com>2015-02-12 02:15:47 +0100
committerJames Bottomley <JBottomley@Odin.com>2015-04-08 18:40:57 +0200
commit2e7cee027b26cbe7e6685a7a14bd2850bfe55d33 (patch)
treef81a6ee1d994edba897cf8a6ddd96bb58a5d2b7f /drivers/scsi
parentenclosure: fix WARN_ON removing an adapter in multi-path devices (diff)
downloadlinux-2e7cee027b26cbe7e6685a7a14bd2850bfe55d33.tar.xz
linux-2e7cee027b26cbe7e6685a7a14bd2850bfe55d33.zip
be2iscsi: Fix kernel panic when device initialization fails
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> Cc: <stable@vger.kernel.org> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
-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 a7cc61837818..923a2b5a2439 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5734,9 +5734,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;