From: Matthew Wilcox <matthew@wil.cx>
Date: Thu, 3 Jul 2008 02:45:51 +0000 (+0000)
Subject: SCSI: ses: Fix timeout
X-Git-Tag: v2.6.25.12~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84671354a49a26e169f08b35ad0884902732bacc;p=thirdparty%2Fkernel%2Fstable.git

SCSI: ses: Fix timeout

commit c95e62ce8905aab62fed224eaaa9b8558a0ef652 upstream

Timeouts are measured in jiffies, not in seconds.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index a6d96694d0a50..f1f2f6554ed69 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,