mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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.
This commit is contained in:
commit
6ac5310e64
45 changed files with 507 additions and 364 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue