lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 350/639] watchdog: rtd119x_wdt: Fix remove function
    Date
    From: Guenter Roeck <linux@roeck-us.net>

    [ Upstream commit 8dd29f19512cc75ee470d7bb8ec86af199de23a8 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/watchdog/rtd119x_wdt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c
    index d001c17ddfdee..99caec6882d2f 100644
    --- a/drivers/watchdog/rtd119x_wdt.c
    +++ b/drivers/watchdog/rtd119x_wdt.c
    @@ -135,7 +135,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);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:19    [W:2.272 / U:0.840 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site