Skip to content

Commit

Permalink
watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
Browse files Browse the repository at this point in the history
[ Upstream commit 7f53907 ]

The commit in Fixes has only updated the remove function and missed the
error handling path of the probe.

Add the missing reset_control_assert() call.

Fixes: 65a3b69 ("watchdog: dw_wdt: get reset lines from dt")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/fbb650650bbb33a8fa2fd028c23157bedeed50e1.1682491863.git.christophe.jaillet@wanadoo.fr
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>
  • Loading branch information
tititiou36 authored and gregkh committed May 17, 2023
1 parent c36975a commit 1e8ad3e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/watchdog/dw_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)

ret = dw_wdt_init_timeouts(dw_wdt, dev);
if (ret)
goto out_disable_clk;
goto out_assert_rst;

wdd = &dw_wdt->wdd;
wdd->ops = &dw_wdt_ops;
Expand Down Expand Up @@ -666,12 +666,15 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)

ret = watchdog_register_device(wdd);
if (ret)
goto out_disable_pclk;
goto out_assert_rst;

dw_wdt_dbgfs_init(dw_wdt);

return 0;

out_assert_rst:
reset_control_assert(dw_wdt->rst);

out_disable_pclk:
clk_disable_unprepare(dw_wdt->pclk);

Expand Down

0 comments on commit 1e8ad3e

Please sign in to comment.