projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into locking/urgent, to pick up fixes
[linux-2.6-microblaze.git]
/
drivers
/
watchdog
/
gpio_wdt.c
diff --git
a/drivers/watchdog/gpio_wdt.c
b/drivers/watchdog/gpio_wdt.c
index
ba066e4
..
93457ca
100644
(file)
--- a/
drivers/watchdog/gpio_wdt.c
+++ b/
drivers/watchdog/gpio_wdt.c
@@
-151,6
+151,8
@@
static int gpio_wdt_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
+ platform_set_drvdata(pdev, priv);
+
priv->gpio = of_get_gpio_flags(pdev->dev.of_node, 0, &flags);
if (!gpio_is_valid(priv->gpio))
return priv->gpio;