projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[linux-drm-fsl-dcu.git]
/
drivers
/
char
/
watchdog
/
pnx4008_wdt.c
diff --git
a/drivers/char/watchdog/pnx4008_wdt.c
b/drivers/char/watchdog/pnx4008_wdt.c
index ff6f1ca1e5e7119b48ace7d55843b0b6871367c6..5991add702b00e32efaf83711ebdb2a60dc8b832 100644
(file)
--- a/
drivers/char/watchdog/pnx4008_wdt.c
+++ b/
drivers/char/watchdog/pnx4008_wdt.c
@@
-283,7
+283,8
@@
static int pnx4008_wdt_probe(struct platform_device *pdev)
wdt_base = (void __iomem *)IO_ADDRESS(res->start);
wdt_clk = clk_get(&pdev->dev, "wdt_ck");
- if (!wdt_clk) {
+ if (IS_ERR(wdt_clk)) {
+ ret = PTR_ERR(wdt_clk);
release_resource(wdt_mem);
kfree(wdt_mem);
goto out;