summaryrefslogtreecommitdiff
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:10:24 +0200
commit3a79627f0ee10b314e39cf1040a53971adebfa21 (patch)
tree54e3d0703bbe3a700942387184dceaf2f0a18d29
parentfe4d073fcb5b399b8ed415be8a1a9ae93d52b19b (diff)
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>
-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 9cc047bc763b..7a56f443ffc0 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5735,9 +5735,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;