projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a97a09b)
watchdog: at91rm9200: Correct check for syscon_node_to_regmap() errors
authorBjorn Andersson <bjorn.andersson@sonymobile.com>
Mon, 17 Aug 2015 16:19:03 +0000 (09:19 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 9 Sep 2015 19:39:07 +0000 (21:39 +0200)
syscon_node_to_regmap() returns a regmap or an ERR_PTR().

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/at91rm9200_wdt.c patch | blob | blame | history

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 41cecb55766c049b600834d6ee021ef45f15332e..464bf76842a49cfb4834880a35c513448b25576e 100644 (file)
--- 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);