Merge tag 'char-misc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-block.git] / drivers / watchdog / mei_wdt.c

diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
index 5391bf3e6b11d944e0cae150a3cac38381c264fe..e023d7d90d66f4fa4ec9dae3cfca2695ce25f353 100644 (file)
--- a/drivers/watchdog/mei_wdt.c
+++ b/drivers/watchdog/mei_wdt.c
@@ -382,6 +382,7 @@ static int mei_wdt_register(struct mei_wdt *wdt)
 
        watchdog_set_drvdata(&wdt->wdd, wdt);
        watchdog_stop_on_reboot(&wdt->wdd);
+       watchdog_stop_on_unregister(&wdt->wdd);
 
        ret = watchdog_register_device(&wdt->wdd);
        if (ret)
@@ -619,7 +620,7 @@ err_out:
        return ret;
 }
 
-static int mei_wdt_remove(struct mei_cl_device *cldev)
+static void mei_wdt_remove(struct mei_cl_device *cldev)
 {
        struct mei_wdt *wdt = mei_cldev_get_drvdata(cldev);
 
@@ -636,8 +637,6 @@ static int mei_wdt_remove(struct mei_cl_device *cldev)
        dbgfs_unregister(wdt);
 
        kfree(wdt);
-
-       return 0;
 }
 
 #define MEI_UUID_WD UUID_LE(0x05B79A6F, 0x4628, 0x4D7F, \