Sfoglia il codice sorgente

[SCSI] lpfc 8.1.2: Fixed a double insertion of mail box object to the SLI mailbox list.

Fixed a double insertion of mail box object to the SLI mailbox list.

Signed-off-by: Jamie Wellnitz <Jamie.Wellnitz@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Jamie Wellnitz 19 anni fa
parent
commit
406d6041ac
1 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. 2 3
      drivers/scsi/lpfc/lpfc_sli.c

+ 2 - 3
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;
-		}
 	}