projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[linux-2.6-block.git]
/
drivers
/
watchdog
/
sb_wdog.c
diff --git
a/drivers/watchdog/sb_wdog.c
b/drivers/watchdog/sb_wdog.c
index 25c7a3f9652d92781ea03468c369bf0ba746bbf5..ea5d84a1fdad71ad517eba174d5ef1a0fb8cffb0 100644
(file)
--- a/
drivers/watchdog/sb_wdog.c
+++ b/
drivers/watchdog/sb_wdog.c
@@
-208,7
+208,7
@@
static long sbwdog_ioctl(struct file *file, unsigned int cmd,
* get the remaining count from the ... count register
* which is 1*8 before the config register
*/
- ret = put_user(__raw_readq(user_dog - 8) / 1000000, p);
+ ret = put_user(
(u32)
__raw_readq(user_dog - 8) / 1000000, p);
break;
}
return ret;