diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-07-02 17:19:04 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-12 18:11:43 +0200 |
| commit | 6ac5310e649df5fcd240d764503bf16a1317ea39 (patch) | |
| tree | 286700815b3f30dc13cc3b2d9980b0244b244d33 /drivers/watchdog | |
| parent | 704e6460ab75af0735b1ca7c0dcaa4ff0a4001b2 (diff) | |
| parent | 3f90b82df110ef9cb33761b56ca85ae0d0372d4a (diff) | |
| download | kernel-common-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.gz kernel-common-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.bz2 kernel-common-6ac5310e649df5fcd240d764503bf16a1317ea39.zip | |
Merge branch '3.10-fixes' into mips-for-linux-next
This that should have been fixed but weren't, way to much, intrusive
and late.
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/sb_wdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index 25c7a3f9652d..ea5d84a1fdad 100644 --- 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; |