summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorJames Smart <james.smart@emulex.com>2012-05-09 21:17:37 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-05-17 11:01:43 +0100
commit81378052645b137e9973aa5e5b2bc0ddd69023d8 (patch)
tree5b732edad63688e2498b689a2c34b8ce547f6bcc /drivers/scsi/lpfc
parent37db57e32bd1b00170fdd38ab36a7f2acdd7557c (diff)
downloadlinux-stable-81378052645b137e9973aa5e5b2bc0ddd69023d8.tar.gz
linux-stable-81378052645b137e9973aa5e5b2bc0ddd69023d8.tar.bz2
linux-stable-81378052645b137e9973aa5e5b2bc0ddd69023d8.zip
[SCSI] lpfc 8.3.31: Fix error message displayed even when not an error
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com> Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 7c4067913c29..d693f67ee074 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -13278,16 +13278,14 @@ lpfc_sli4_next_xritag(struct lpfc_hba *phba)
uint16_t xri_index;
xri_index = lpfc_sli4_alloc_xri(phba);
- if (xri_index != NO_XRI)
- return xri_index;
-
- lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
- "2004 Failed to allocate XRI.last XRITAG is %d"
- " Max XRI is %d, Used XRI is %d\n",
- xri_index,
- phba->sli4_hba.max_cfg_param.max_xri,
- phba->sli4_hba.max_cfg_param.xri_used);
- return NO_XRI;
+ if (xri_index == NO_XRI)
+ lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
+ "2004 Failed to allocate XRI.last XRITAG is %d"
+ " Max XRI is %d, Used XRI is %d\n",
+ xri_index,
+ phba->sli4_hba.max_cfg_param.max_xri,
+ phba->sli4_hba.max_cfg_param.xri_used);
+ return xri_index;
}
/**