]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
snsc: pass timeout as HZ independent value
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 27 May 2015 16:34:47 +0000 (18:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jun 2015 01:29:50 +0000 (10:29 +0900)
schedule_timeout takes a timeout in jiffies but the code currently is
passing in a constant SCDRV_TIMEOUT which makes this timeout HZ
dependent, so pass it through msecs_to_jiffies() to fix this up.

patch was compile tested with generic_defconfig (implies CONFIG_SGI_SNSC=y)

Patch is against 4.0-rc5 (localversion-next is -next-20150527)

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/snsc.c

index 8bab59292a0d0a42f2a89914edc36824483160f0..8a80ead8d31681cf2e1ef7c538a0d5b1b449d143 100644 (file)
@@ -198,7 +198,7 @@ scdrv_read(struct file *file, char __user *buf, size_t count, loff_t *f_pos)
                add_wait_queue(&sd->sd_rq, &wait);
                spin_unlock_irqrestore(&sd->sd_rlock, flags);
 
-               schedule_timeout(SCDRV_TIMEOUT);
+               schedule_timeout(msecs_to_jiffies(SCDRV_TIMEOUT));
 
                remove_wait_queue(&sd->sd_rq, &wait);
                if (signal_pending(current)) {
@@ -294,7 +294,7 @@ scdrv_write(struct file *file, const char __user *buf,
                add_wait_queue(&sd->sd_wq, &wait);
                spin_unlock_irqrestore(&sd->sd_wlock, flags);
 
-               schedule_timeout(SCDRV_TIMEOUT);
+               schedule_timeout(msecs_to_jiffies(SCDRV_TIMEOUT));
 
                remove_wait_queue(&sd->sd_wq, &wait);
                if (signal_pending(current)) {