From: Kashyap, Desai <kashyap.desai@lsi.com>
Date: Wed, 16 Dec 2009 13:21:05 +0000 (+0530)
Subject: [SCSI] mpt2sas: Return -ENODATA on IOCTL timeout
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b2ff36ba19dec02b05d3e26e36923b71ab64f34a;p=deliverable%2Flinux.git

[SCSI] mpt2sas: Return -ENODATA on IOCTL timeout

The driver was modified to return -ENODATA when there is a timeout
via ioctl path.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Reviewed-by: Eric Moore <eric.moore@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
---

diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 84a124f8e21f..198ecdd849a4 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -891,6 +891,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,
 
  issue_host_reset:
 	if (issue_reset) {
+		ret = -ENODATA;
 		if ((mpi_request->Function == MPI2_FUNCTION_SCSI_IO_REQUEST ||
 		    mpi_request->Function ==
 		    MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH)) {