diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/char/watchdog/pnx4008_wdt.c | |
| parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe... (diff) | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| download | linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/watchdog/pnx4008_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/pnx4008_wdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c index ff6f1ca1e5e7..5991add702b0 100644 --- 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; |