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>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a7b2da34647fab2be5eee81e4124649d71cb35d9..4f98cea91f7543b60064fa31bb744809364b8539 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -6515,7 +6515,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);