From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 4 Mar 2010 20:48:43 +0000 (+0000)
Subject: fix watchdog driver unregistering, patch by Bernhard Loos
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=da72558c327b1b39a7a17b7d96aed1f401c2fc53;p=openwrt%2Fstaging%2Fwigyori.git

fix watchdog driver unregistering, patch by Bernhard Loos

SVN-Revision: 19979
---

diff --git a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
index 9e8b0372d2..3ced6c9a21 100644
--- a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
+++ b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
@@ -28,6 +28,7 @@
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include <asm/rdc321x_defs.h>
 
@@ -123,8 +124,12 @@ static int rdc321x_wdt_open(struct inode *inode, struct file *file)
 
 static int rdc321x_wdt_release(struct inode *inode, struct file *file)
 {
-	if (rdc321x_wdt_dev.close_expected)
-		rdc321x_wdt_stop();
+	int res;
+	if (rdc321x_wdt_dev.close_expected) {
+		res = rdc321x_wdt_stop();
+		if (res)
+			return res;
+	}
 
 	rdc321x_wdt_dev.inuse = false;
 
@@ -181,7 +186,7 @@ static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
 				size_t count, loff_t *ppos)
 {
 	size_t i;
- 
+
 	if (!count)
 		return -EIO;
 
@@ -248,6 +253,10 @@ static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
 {
 	if (rdc321x_wdt_dev.inuse)
 		rdc321x_wdt_dev.inuse = 0;
+
+	while (timer_pending(&rdc321x_wdt_dev.timer))
+		msleep(100);
+
 	misc_deregister(&rdc321x_wdt_misc);
 	return 0;
 }