Skip to content

Commit

Permalink
[WATCHDOG] fix clk_get() error check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Akinobu Mita authored and Wim Van Sebroeck committed Dec 19, 2006
1 parent 0b6dd8a commit 9cd4461
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/char/watchdog/pnx4008_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/char/watchdog/s3c2410_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 9cd4461

Please sign in to comment.