From: Jamie Wellnitz Date: Wed, 1 Mar 2006 00:25:20 +0000 (-0500) Subject: [SCSI] lpfc 8.1.2: Fixed a double insertion of mail box object to the SLI mailbox... X-Git-Tag: v2.6.17-rc1~1129^2~4^2~106 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=406d6041ace581b63a7898f3c1ef036c58c74989;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index cb4ccbba065..1f876328b44 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; - } }