diff options
author | Quinn Tran <quinn.tran@cavium.com> | 2018-09-11 10:18:21 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 09:24:05 +0100 |
commit | 21339e8cf0024bf6068a118d985f28417afc1d66 (patch) | |
tree | 88d34419f7ac246aae671db4fa04778382ddf3d8 | |
parent | 4b6f0ec528d6c56e7394dde2bb72ba2af35305ac (diff) | |
download | linux-stable-21339e8cf0024bf6068a118d985f28417afc1d66.tar.gz linux-stable-21339e8cf0024bf6068a118d985f28417afc1d66.tar.bz2 linux-stable-21339e8cf0024bf6068a118d985f28417afc1d66.zip |
scsi: qla2xxx: shutdown chip if reset fail
commit 1e4ac5d6fe0a4af17e4b6251b884485832bf75a3 upstream.
If chip unable to fully initialize, use full shutdown sequence to clear out
any stale FW state.
Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring")
Cc: stable@vger.kernel.org #4.10
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index de40202b9ac7..5c7d2628232d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -6077,7 +6077,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) * The next call disables the board * completely. */ - ha->isp_ops->reset_adapter(vha); + qla2x00_abort_isp_cleanup(vha); vha->flags.online = 0; clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags); |