summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorSaurav Kashyap <skashyap@marvell.com>2020-08-06 04:10:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-03 11:24:25 +0200
commit2d1a5f56ac7b74e78a25a43e0fa59fad6f79d570 (patch)
treed0ecede70d1d5d0b9d64af86231aa8a02bf97d75 /drivers/scsi/qla2xxx
parentf92ff03ee69f3d7e937a4c7421c478232fc55a78 (diff)
downloadlinux-stable-2d1a5f56ac7b74e78a25a43e0fa59fad6f79d570.tar.gz
linux-stable-2d1a5f56ac7b74e78a25a43e0fa59fad6f79d570.tar.bz2
linux-stable-2d1a5f56ac7b74e78a25a43e0fa59fad6f79d570.zip
Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
[ Upstream commit de7e6194301ad31c4ce95395eb678e51a1b907e5 ] FCoE adapter initialization failed for ISP8021 with the following patch applied. In addition, reproduction of the issue the patch originally tried to address has been unsuccessful. This reverts commit 3cb182b3fa8b7a61f05c671525494697cba39c6a. Link: https://lore.kernel.org/r/20200806111014.28434-11-njavali@marvell.com Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Saurav Kashyap <skashyap@marvell.com> Signed-off-by: Nilesh Javali <njavali@marvell.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index ac5d2d34aeea..07c5d7397d42 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -329,14 +329,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
if (time_after(jiffies, wait_time))
break;
- /*
- * Check if it's UNLOADING, cause we cannot poll in
- * this case, or else a NULL pointer dereference
- * is triggered.
- */
- if (unlikely(test_bit(UNLOADING, &base_vha->dpc_flags)))
- return QLA_FUNCTION_TIMEOUT;
-
/* Check for pending interrupts. */
qla2x00_poll(ha->rsp_q_map[0]);