Browse Source

[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>
Akinobu Mita 18 years ago
parent
commit
9cd446198e
2 changed files with 4 additions and 3 deletions
  1. 2 1
      drivers/char/watchdog/pnx4008_wdt.c
  2. 2 2
      drivers/char/watchdog/s3c2410_wdt.c

+ 2 - 1
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_base = (void __iomem *)IO_ADDRESS(res->start);
 
 
 	wdt_clk = clk_get(&pdev->dev, "wdt_ck");
 	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);
 		release_resource(wdt_mem);
 		kfree(wdt_mem);
 		kfree(wdt_mem);
 		goto out;
 		goto out;

+ 2 - 2
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");
 	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");
 		printk(KERN_INFO PFX "failed to find watchdog clock source\n");
-		ret =  -ENOENT;
+		ret = PTR_ERR(wdt_clock);
 		goto err_irq;
 		goto err_irq;
 	}
 	}