diff options
author | John Soni Jose <sony.john-n@emulex.com> | 2015-02-11 20:15:47 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-04-08 12:40:57 -0400 |
commit | 2e7cee027b26cbe7e6685a7a14bd2850bfe55d33 (patch) | |
tree | f81a6ee1d994edba897cf8a6ddd96bb58a5d2b7f /drivers/scsi/be2iscsi | |
parent | 11e52a699afff576606ceb6cf697270459f1a4aa (diff) |
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/be2iscsi')
-rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 2 |
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: | |||
5734 | hba_free: | 5734 | hba_free: |
5735 | if (phba->msix_enabled) | 5735 | if (phba->msix_enabled) |
5736 | pci_disable_msix(phba->pcidev); | 5736 | pci_disable_msix(phba->pcidev); |
5737 | iscsi_host_remove(phba->shost); | ||
5738 | pci_dev_put(phba->pcidev); | 5737 | pci_dev_put(phba->pcidev); |
5739 | iscsi_host_free(phba->shost); | 5738 | iscsi_host_free(phba->shost); |
5739 | pci_set_drvdata(pcidev, NULL); | ||
5740 | disable_pci: | 5740 | disable_pci: |
5741 | pci_disable_device(pcidev); | 5741 | pci_disable_device(pcidev); |
5742 | return ret; | 5742 | return ret; |