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 07/11] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
    Allow the watchdog timer to be enabled or disabled via the
    WDIOC_SETOPTIONS ioctl.

    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    ---
    drivers/char/watchdog/mv64x60_wdt.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    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:29:15.000000000 +0000
    +++ linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c 2007-07-20 19:29:34.000000000 +0000
    @@ -132,6 +132,7 @@ static int mv64x60_wdt_ioctl(struct inod
    unsigned int cmd, unsigned long arg)
    {
    int timeout;
    + int options;
    void __user *argp = (void __user *)arg;
    static struct watchdog_info info = {
    .options = WDIOF_SETTIMEOUT |
    @@ -157,7 +158,15 @@ static int mv64x60_wdt_ioctl(struct inod
    return -EOPNOTSUPP;

    case WDIOC_SETOPTIONS:
    - return -EOPNOTSUPP;
    + if (get_user(options, (int __user *)argp))
    + return -EFAULT;
    +
    + if (options & WDIOS_DISABLECARD)
    + mv64x60_wdt_handler_disable();
    +
    + if (options & WDIOS_ENABLECARD)
    + mv64x60_wdt_handler_enable();
    + break;

    case WDIOC_KEEPALIVE:
    mv64x60_wdt_service();
    -
    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:19    [W:0.020 / U:88.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site