diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:57:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 18:57:33 -0700 |
commit | f36b7a2c170ff1dbbb38d235817e04020b196950 (patch) | |
tree | 13b97589aa79ff615c85d42b09a29effd59f33a2 /drivers/scsi/ses.c | |
parent | cefcade9e7b2331110fdd709b5871ebcc5f9a40f (diff) | |
parent | ec5e69f6d3f4350681d6f7eaae515cf014be9276 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] esp: tidy up target reference counting
[SCSI] esp: Fix OOPS in esp_reset_cleanup().
[SCSI] ses: Fix timeout
Diffstat (limited to 'drivers/scsi/ses.c')
-rw-r--r-- | drivers/scsi/ses.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 45df83b9d84..0fe031f003e 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, |