diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-12-19 17:51:44 +0900 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-12-19 22:16:51 +0100 |
| commit | 9cd446198e7646431a7f2ce7dbeec8df9f77012b (patch) | |
| tree | ab2bb2cf8eff7c7e75b8cf34174692c02ebdd8be | |
| parent | 0b6dd8a640fbaf73b74949b6dc2be50263532576 (diff) | |
| download | lwn-9cd446198e7646431a7f2ce7dbeec8df9f77012b.tar.gz lwn-9cd446198e7646431a7f2ce7dbeec8df9f77012b.zip | |
[WATCHDOG] fix clk_get() error check
The return value of clk_get() should be checked by IS_ERR().
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/char/watchdog/pnx4008_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c index 3a55fc6abcd8..0e3d589d6332 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; diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index d3c073787f5b..5a5cc2a2c5af 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c @@ -393,9 +393,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev) } wdt_clock = clk_get(&pdev->dev, "watchdog"); - if (wdt_clock == NULL) { + if (IS_ERR(wdt_clock)) { printk(KERN_INFO PFX "failed to find watchdog clock source\n"); - ret = -ENOENT; + ret = PTR_ERR(wdt_clock); goto err_irq; } |