diff options
author | Jamie Wellnitz <Jamie.Wellnitz@emulex.com> | 2006-02-28 19:25:20 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-02-28 19:55:50 -0500 |
commit | 406d6041ace581b63a7898f3c1ef036c58c74989 (patch) | |
tree | 29388d4dbafbe59382bdd8ce40981c9b48ac7738 | |
parent | 901a920f0759c6ea94255f3c2cd6ec324f7e4752 (diff) |
[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>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 5 |
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, | |||
2867 | pmboxq->context1 = NULL; | 2867 | pmboxq->context1 = NULL; |
2868 | /* if schedule_timeout returns 0, we timed out and were not | 2868 | /* if schedule_timeout returns 0, we timed out and were not |
2869 | woken up */ | 2869 | woken up */ |
2870 | if (timeleft == 0) { | 2870 | if ((timeleft == 0) || signal_pending(current)) |
2871 | retval = MBX_TIMEOUT; | 2871 | retval = MBX_TIMEOUT; |
2872 | } else { | 2872 | else |
2873 | retval = MBX_SUCCESS; | 2873 | retval = MBX_SUCCESS; |
2874 | } | ||
2875 | } | 2874 | } |
2876 | 2875 | ||
2877 | 2876 | ||