Merge tag 'linux-watchdog-5.2-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / drivers / watchdog / machzwd.c

diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index 53759415cf06e9890315e0a0a63245a94e9ff93f..c0c9e948adbcd48bd91d7e77110203113796d871 100644 (file)
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -177,6 +177,7 @@ static inline void zf_set_timer(unsigned short new, unsigned char n)
        switch (n) {
        case WD1:
                zf_writew(COUNTER_1, new);
+               /* fall through */
        case WD2:
                zf_writeb(COUNTER_2, new > 0xff ? 0xff : new);
        default:
@@ -318,7 +319,7 @@ static long zf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
        case WDIOC_KEEPALIVE:
-               zf_ping(0);
+               zf_ping(NULL);
                break;
        default:
                return -ENOTTY;