watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
[ Upstream commit7f53907506
] 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:65a3b6935d
("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>
This commit is contained in:
parent
2793a9cc0f
commit
f76b4a4fcd
|
@ -635,7 +635,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = dw_wdt_init_timeouts(dw_wdt, dev);
|
ret = dw_wdt_init_timeouts(dw_wdt, dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_disable_clk;
|
goto out_assert_rst;
|
||||||
|
|
||||||
wdd = &dw_wdt->wdd;
|
wdd = &dw_wdt->wdd;
|
||||||
wdd->ops = &dw_wdt_ops;
|
wdd->ops = &dw_wdt_ops;
|
||||||
|
@ -666,12 +666,15 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = watchdog_register_device(wdd);
|
ret = watchdog_register_device(wdd);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_disable_pclk;
|
goto out_assert_rst;
|
||||||
|
|
||||||
dw_wdt_dbgfs_init(dw_wdt);
|
dw_wdt_dbgfs_init(dw_wdt);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
out_assert_rst:
|
||||||
|
reset_control_assert(dw_wdt->rst);
|
||||||
|
|
||||||
out_disable_pclk:
|
out_disable_pclk:
|
||||||
clk_disable_unprepare(dw_wdt->pclk);
|
clk_disable_unprepare(dw_wdt->pclk);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue