diff options
| author | Michael Büsch <mb@bu3sch.de> | 2011-03-02 16:20:58 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2011-03-02 16:20:58 +0000 |
| commit | d5d6811ac49b533e7fb996b513c406d8fe75a85e (patch) | |
| tree | 68efdedb2ee79bb02a2bc201f22df79d1cec2c5e /target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch | |
| parent | 3c801b3dc0359aa8b2b8876503f03e4bdf89c649 (diff) | |
| download | upstream-d5d6811ac49b533e7fb996b513c406d8fe75a85e.tar.gz upstream-d5d6811ac49b533e7fb996b513c406d8fe75a85e.tar.bz2 upstream-d5d6811ac49b533e7fb996b513c406d8fe75a85e.zip | |
cbus-retu-wdt: Some fixes
SVN-Revision: 25832
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch')
| -rw-r--r-- | target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch b/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch new file mode 100644 index 0000000000..6de2c79f1a --- /dev/null +++ b/target/linux/omap24xx/patches-2.6.38/531-cbus-retu-wdt-fix-bitfield.patch @@ -0,0 +1,39 @@ +Index: linux-2.6.38-rc6/drivers/cbus/retu-wdt.c +=================================================================== +--- linux-2.6.38-rc6.orig/drivers/cbus/retu-wdt.c 2011-03-02 16:46:24.574676092 +0100 ++++ linux-2.6.38-rc6/drivers/cbus/retu-wdt.c 2011-03-02 16:48:17.469807413 +0100 +@@ -56,7 +56,7 @@ static int counter_param = RETU_WDT_MAX_ + + struct retu_wdt_dev { + struct device *dev; +- int users; ++ unsigned long users; + struct miscdevice retu_wdt_miscdev; + struct delayed_work ping_work; + }; +@@ -161,7 +161,7 @@ static DEVICE_ATTR(counter, S_IRUGO, ret + + static int retu_wdt_open(struct inode *inode, struct file *file) + { +- if (test_and_set_bit(1, (unsigned long *)&(retu_wdt->users))) ++ if (test_and_set_bit(0, &retu_wdt->users)) + return -EBUSY; + + file->private_data = (void *)retu_wdt; +@@ -177,7 +177,7 @@ static int retu_wdt_release(struct inode + #ifndef CONFIG_WATCHDOG_NOWAYOUT + retu_wdt_ping_enable(retu_wdt); + #endif +- wdev->users = 0; ++ clear_bit(0, &retu_wdt->users); + + return 0; + } +@@ -264,7 +264,6 @@ static int __init retu_wdt_probe(struct + return -ENOMEM; + + wdev->dev = &pdev->dev; +- wdev->users = 0; + + ret = device_create_file(&pdev->dev, &dev_attr_period); + if (ret) { |