summaryrefslogtreecommitdiff
path: root/drivers/watchdog/rtd119x_wdt.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2019-04-07 08:29:35 -0700
committerWim Van Sebroeck <wim@linux-watchdog.org>2019-05-05 21:02:13 +0200
commit8dd29f19512cc75ee470d7bb8ec86af199de23a8 (patch)
treeb616713ac620edd2e13e51d0048501208cfaf88a /drivers/watchdog/rtd119x_wdt.c
parente2a4aeda87d39b616c4064ae8c67972f283067ee (diff)
watchdog: rtd119x_wdt: Fix remove function
The driver registers the watchdog with devm_watchdog_register_device() but still calls watchdog_unregister_device() on remove. Since clocks have to be stopped when removing the driver, after the watchdog device has been unregistered, we can not drop the call to watchdog_unregister_device(). Use watchdog_register_device() to register the watchdog. Fixes: 2bdf6acbfead7 ("watchdog: Add Realtek RTD1295") Cc: Andreas Färber <afaerber@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog/rtd119x_wdt.c')
-rw-r--r--drivers/watchdog/rtd119x_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c
index d823c9def36f..cb17c49f3534 100644
--- a/drivers/watchdog/rtd119x_wdt.c
+++ b/drivers/watchdog/rtd119x_wdt.c
@@ -133,7 +133,7 @@ static int rtd119x_wdt_probe(struct platform_device *pdev)
rtd119x_wdt_set_timeout(&data->wdt_dev, data->wdt_dev.timeout);
rtd119x_wdt_stop(&data->wdt_dev);
- ret = devm_watchdog_register_device(&pdev->dev, &data->wdt_dev);
+ ret = watchdog_register_device(&data->wdt_dev);
if (ret) {
clk_disable_unprepare(data->clk);
clk_put(data->clk);