1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index cb4ccbba0652..1f876328b44b 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2867,11 +2867,10 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,
                 pmboxq->context1 = NULL;
                 /* if schedule_timeout returns 0, we timed out and were not
                    woken up */
-                if (timeleft == 0) {
+                if ((timeleft == 0) || signal_pending(current))
                         retval = MBX_TIMEOUT;
-                } else {
+                else
                         retval = MBX_SUCCESS;
-                }
         }