Commit 7f539075 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe() 



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: 65a3b693 ("watchdog: dw_wdt: get reset lines from dt")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/fbb650650bbb33a8fa2fd028c23157bedeed50e1.1682491863.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent b23c1f80

drivers/watchdog/dw_wdt.c

+5 −2
Original line number Diff line number Diff line
@@ -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;
@@ -667,12 +667,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);