---

yaml --- r: 173560 b: refs/heads/master c: 8d56825 h: refs/heads/master v: v3
git-mirror · Oct 29, 2009 · 9c253df · 9c253df
1 parent cfd6149
commit 9c253df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 153f251e477f41dab0314c4cd2004b9e7ebac4eb
+refs/heads/master: 8d56825321339f0ef7ad08eb58332e1836881e3b
diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas.c b/trunk/drivers/scsi/megaraid/megaraid_sas.c
@@ -686,6 +686,17 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
 
 	memcpy(pthru->cdb, scp->cmnd, scp->cmd_len);
 
+	/*
+	* If the command is for the tape device, set the
+	* pthru timeout to the os layer timeout value.
+	*/
+	if (scp->device->type == TYPE_TAPE) {
+		if ((scp->request->timeout / HZ) > 0xFFFF)
+			pthru->timeout = 0xFFFF;
+		else
+			pthru->timeout = scp->request->timeout / HZ;
+	}
+
 	/*
 	 * Construct SGL
 	 */