Merge tag 'gpio-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[linux-2.6-microblaze.git] / drivers / watchdog / sb_wdog.c

diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 5a6ced7..da2dad0 100644 (file)
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -202,6 +202,7 @@ static long sbwdog_ioctl(struct file *file, unsigned int cmd,
                timeout = time;
                sbwdog_set(user_dog, timeout);
                sbwdog_pet(user_dog);
+               /* Fall through */
 
        case WDIOC_GETTIMEOUT:
                /*
@@ -236,6 +237,7 @@ static const struct file_operations sbwdog_fops = {
        .llseek         = no_llseek,
        .write          = sbwdog_write,
        .unlocked_ioctl = sbwdog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = sbwdog_open,
        .release        = sbwdog_release,
 };