lkml.org 
[lkml]   [2007]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 05/11] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
    WDIOC_GETTIMEOUT returns seconds, not jiffies.

    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    ---
    drivers/char/watchdog/mv64x60_wdt.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    Index: linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c
    ===================================================================
    --- linux-2.6-powerpc-wdt.orig/drivers/char/watchdog/mv64x60_wdt.c 2007-07-20 19:17:17.000000000 +0000
    +++ linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c 2007-07-20 19:23:23.000000000 +0000
    @@ -118,7 +118,6 @@ static ssize_t mv64x60_wdt_write(struct
    static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,
    unsigned int cmd, unsigned long arg)
    {
    - int timeout;
    void __user *argp = (void __user *)arg;
    static struct watchdog_info info = {
    .options = WDIOF_KEEPALIVEPING,
    @@ -154,8 +153,7 @@ static int mv64x60_wdt_ioctl(struct inod
    return -EOPNOTSUPP;

    case WDIOC_GETTIMEOUT:
    - timeout = mv64x60_wdt_timeout * HZ;
    - if (put_user(timeout, (int __user *)argp))
    + if (put_user(mv64x60_wdt_timeout, (int __user *)argp))
    return -EFAULT;
    break;

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-24 20:17    [W:0.019 / U:62.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site