summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@sonymobile.com>2015-08-17 09:19:03 -0700
committerWim Van Sebroeck <wim@iguana.be>2015-09-09 21:39:07 +0200
commitbf5125d5e0759a0f513b1bcd33c15edc0cf4c17b (patch)
treea2d5ceb13f832a90452a22b39ae2b1a5951b3e2d /drivers
parenta97a09bd119fbdf4ba8c634fed8f4148d1def1e0 (diff)
downloadlinux-stable-bf5125d5e0759a0f513b1bcd33c15edc0cf4c17b.tar.gz
linux-stable-bf5125d5e0759a0f513b1bcd33c15edc0cf4c17b.tar.bz2
linux-stable-bf5125d5e0759a0f513b1bcd33c15edc0cf4c17b.zip
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 <bjorn.andersson@sonymobile.com> Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/at91rm9200_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 41cecb55766c..464bf76842a4 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);