Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux.git] / drivers / watchdog / sbc7240_wdt.c

diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 12cdee7d5069ccdca795de93f8e64e9b37530601..520b8dd77ed4bbdc56ee497dc8f58037da921028 100644 (file)
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -194,9 +194,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                if (wdt_set_timeout(new_timeout))
                        return -EINVAL;
-
-               /* Fall through */
        }
+       /* Fall through */
        case WDIOC_GETTIMEOUT:
                return put_user(timeout, (int __user *)arg);
        default:
@@ -211,6 +210,7 @@ static const struct file_operations wdt_fops = {
        .open = fop_open,
        .release = fop_close,
        .unlocked_ioctl = fop_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {