[PATCH v3] scsi: mpt3sas: wait_for_completion_timeout timeout not reported

From: Nicholas Mc Guire
Date: Wed Dec 31 2014 - 03:58:19 EST

wait_for_completion_timeout reaching timeout was being ignored,
this also should fail if timeout condition occurs.

v3: proper labeling and attribution - no change of actual patch

this was only compile tested with x86_64_defconfig +

patch is against linux-next 3.19.0-rc1 -next-20141226

Acked-by: Joe Lawrence <joe.lawrence@xxxxxxxxxxx>
Signed-off-by: Nicholas Mc Guire <der.herr@xxxxxxx>
drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index 4472c2a..04ff21b 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -393,7 +393,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
mpt3sas_base_put_smid_default(ioc, smid);
timeleft = wait_for_completion_timeout(&ioc->config_cmds.done,
- if (!(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
+ if (timeleft == 0 || !(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
pr_err(MPT3SAS_FMT "%s: timeout\n",
ioc->name, __func__);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/