2015-08-17 16:19:09

by Bjorn Andersson

Subject: [PATCH] watchdog: at91rm9200: Correct check for syscon_node_to_regmap() errors

syscon_node_to_regmap() returns a regmap or an ERR_PTR().

Signed-off-by: Bjorn Andersson <[email protected]>
---
drivers/watchdog/at91rm9200_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 9ba1153465ae..e12a797cb820 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -244,7 +244,7 @@ static int at91wdt_probe(struct platform_device *pdev)
}

regmap_st = syscon_node_to_regmap(parent->of_node);
- if (!regmap_st)
+ if (IS_ERR(regmap_st))
return -ENODEV;

res = misc_register(&at91wdt_miscdev);
--
1.8.2.2

2015-08-17 16:33:36

by Guenter Roeck

Subject: Re: [PATCH] watchdog: at91rm9200: Correct check for syscon_node_to_regmap() errors

On 08/17/2015 09:19 AM, Bjorn Andersson wrote:
> syscon_node_to_regmap() returns a regmap or an ERR_PTR().
>
> Signed-off-by: Bjorn Andersson <[email protected]>

Acked-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/at91rm9200_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
> index 9ba1153465ae..e12a797cb820 100644
> --- a/drivers/watchdog/at91rm9200_wdt.c
> +++ b/drivers/watchdog/at91rm9200_wdt.c
> @@ -244,7 +244,7 @@ static int at91wdt_probe(struct platform_device *pdev)
> }
>
> regmap_st = syscon_node_to_regmap(parent->of_node);
> - if (!regmap_st)
> + if (IS_ERR(regmap_st))
> return -ENODEV;
>
> res = misc_register(&at91wdt_miscdev);
>