---

yaml --- r: 286918 b: refs/heads/master c: 12c583d h: refs/heads/master v: v3
git-mirror · Jan 27, 2012 · da723fa · da723fa
1 parent b8bd8d5
commit da723fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ea9a7d7946c03aa1f9eeb71adb0191402724dd
+refs/heads/master: 12c583d8dca3320f36afe51e514dfa709ac0662e
diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c
@@ -339,6 +339,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
 	return 0;
 
 err_misc:
+	pm_runtime_disable(wdev->dev);
 	platform_set_drvdata(pdev, NULL);
 	iounmap(wdev->base);
 
@@ -371,6 +372,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev)
 	struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
 	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
+	pm_runtime_disable(wdev->dev);
 	if (!res)
 		return -ENOENT;