[PATCH 60/133] [Jaunty SRU] ARM.imx51 Freescale:ENGR00111946 Watchdog: oops when watchdog resume

Brad Figg brad.figg at canonical.com
Thu Jul 9 16:48:50 UTC 2009


From: Wallace Wang <r59996 at freescale.com>

The watchdong resume funcation takes physical address
as virtual address

Signed-off-by: Wallace Wang <r59996 at freescale.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 drivers/watchdog/mxc_wdt.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/mxc_wdt.c b/drivers/watchdog/mxc_wdt.c
index 3c6698f..833fa4c 100644
--- a/drivers/watchdog/mxc_wdt.c
+++ b/drivers/watchdog/mxc_wdt.c
@@ -297,7 +297,7 @@ static int __init mxc_wdt_probe(struct platform_device *pdev)
 static void mxc_wdt_shutdown(struct platform_device *pdev)
 {
 	struct resource *res = platform_get_drvdata(pdev);
-	mxc_wdt_disable(res->start);
+	mxc_wdt_disable(wdt_base_reg);
 	pr_info("MXC Watchdog # %d shutdown\n", dev_num);
 }
 
@@ -323,7 +323,7 @@ static int mxc_wdt_suspend(struct platform_device *pdev, pm_message_t state)
 	struct resource *res = platform_get_drvdata(pdev);
 
 	if (mxc_wdt_users) {
-		mxc_wdt_disable(res->start);
+		mxc_wdt_disable(wdt_base_reg);
 	}
 	return 0;
 }
@@ -332,8 +332,8 @@ static int mxc_wdt_resume(struct platform_device *pdev)
 {
 	struct resource *res = platform_get_drvdata(pdev);
 	if (mxc_wdt_users) {
-		mxc_wdt_enable(res->start);
-		mxc_wdt_ping(res->start);
+		mxc_wdt_enable(wdt_base_reg);
+		mxc_wdt_ping(wdt_base_reg);
 	}
 	return 0;
 }
-- 
1.6.0.4





More information about the kernel-team mailing list