From 00c261fcbfb70bf3b6b0a875884ebda225802fa8 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Tue, 19 Dec 2006 17:51:44 +0900
Subject: [PATCH] --- yaml --- r: 48130 b: refs/heads/master c:
 9cd446198e7646431a7f2ce7dbeec8df9f77012b h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/pnx4008_wdt.c | 3 ++-
 trunk/drivers/char/watchdog/s3c2410_wdt.c | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e98f88776a8f..e83f1124e75f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b6dd8a640fbaf73b74949b6dc2be50263532576
+refs/heads/master: 9cd446198e7646431a7f2ce7dbeec8df9f77012b
diff --git a/trunk/drivers/char/watchdog/pnx4008_wdt.c b/trunk/drivers/char/watchdog/pnx4008_wdt.c
index 3a55fc6abcd8..0e3d589d6332 100644
--- a/trunk/drivers/char/watchdog/pnx4008_wdt.c
+++ b/trunk/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/trunk/drivers/char/watchdog/s3c2410_wdt.c b/trunk/drivers/char/watchdog/s3c2410_wdt.c
index d3c073787f5b..5a5cc2a2c5af 100644
--- a/trunk/drivers/char/watchdog/s3c2410_wdt.c
+++ b/trunk/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;
 	}