diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 16:14:58 +0100 |
commit | e281e315f438093cbf27b4acdee364e781337a7a (patch) | |
tree | 4cfb1aa49c638091c3ed6ef7d65b4421dd13ee61 /drivers/hwmon/fschmd.c | |
parent | Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
parent | hwmon: (it87) Fix VID reading on IT8718F/IT8720F (diff) | |
download | linux-e281e315f438093cbf27b4acdee364e781337a7a.tar.xz linux-e281e315f438093cbf27b4acdee364e781337a7a.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (it87) Fix VID reading on IT8718F/IT8720F
hwmon: (dme1737) No vid attributes for SCH311x
hwmon: (fschmd) Fix check on unsigned in watchdog_write()
hwmon: (coretemp) Maintainer update
Diffstat (limited to 'drivers/hwmon/fschmd.c')
-rw-r--r-- | drivers/hwmon/fschmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c index 2a7a85a6dc36..da1b1f9488af 100644 --- a/drivers/hwmon/fschmd.c +++ b/drivers/hwmon/fschmd.c @@ -819,7 +819,7 @@ static int watchdog_release(struct inode *inode, struct file *filp) static ssize_t watchdog_write(struct file *filp, const char __user *buf, size_t count, loff_t *offset) { - size_t ret; + int ret; struct fschmd_data *data = filp->private_data; if (count) { |