git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'linux-watchdog-4.21-rc1' of git://www.linux-watchdog.org/linux-watchdog
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
cpwd.c
diff --git
a/drivers/watchdog/cpwd.c
b/drivers/watchdog/cpwd.c
index aee0b25cf10d9afd48604b943fa17d97a6fe6927..32156e199c5127d890d4b54151dbf405543c8bc1 100644
(file)
--- a/
drivers/watchdog/cpwd.c
+++ b/
drivers/watchdog/cpwd.c
@@
-570,6
+570,8
@@
static int cpwd_probe(struct platform_device *op)
if (str_prop)
p->timeout = simple_strtoul(str_prop, NULL, 10);
+ of_node_put(options);
+
/* CP1400s seem to have broken PLD implementations-- the
* interrupt_mask register cannot be written, so no timer
* interrupts can be masked within the PLD.