summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2008-06-23 17:14:31 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-06-24 19:02:27 +0200
commitc95e62ce8905aab62fed224eaaa9b8558a0ef652 (patch)
tree4cf1637e91495becc0bba2adc866bc8fed01c284 /drivers/scsi
parentMerge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
downloadlinux-c95e62ce8905aab62fed224eaaa9b8558a0ef652.tar.xz
linux-c95e62ce8905aab62fed224eaaa9b8558a0ef652.zip
[SCSI] ses: Fix timeout
Timeouts are measured in jiffies, not in seconds. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Cc: Stable Tree <stable@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ses.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 45df83b9d847..0fe031f003e7 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -61,7 +61,7 @@ static int ses_probe(struct device *dev)
return err;
}
-#define SES_TIMEOUT 30
+#define SES_TIMEOUT (30 * HZ)
#define SES_RETRIES 3
static int ses_recv_diag(struct scsi_device *sdev, int page_code,