git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
watchdog
/
wm831x_wdt.c
diff --git
a/drivers/watchdog/wm831x_wdt.c
b/drivers/watchdog/wm831x_wdt.c
index
8c4b2d5
..
871caea
100644
(file)
--- a/
drivers/watchdog/wm831x_wdt.c
+++ b/
drivers/watchdog/wm831x_wdt.c
@@
-320,6
+320,11
@@
static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
struct wm831x_watchdog_pdata *pdata;
int reg, ret;
+ if (wm831x) {
+ dev_err(&pdev->dev, "wm831x watchdog already registered\n");
+ return -EBUSY;
+ }
+
wm831x = dev_get_drvdata(pdev->dev.parent);
ret = wm831x_reg_read(wm831x, WM831X_WATCHDOG);