mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge 4.16-rc6 into tty-next
We want the serial/tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
4958134df5
746 changed files with 7575 additions and 4876 deletions
|
|
@ -122,7 +122,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
|
|||
unsigned char __user *ured;
|
||||
unsigned char __user *ugreen;
|
||||
unsigned char __user *ublue;
|
||||
int index, count, i;
|
||||
unsigned int index, count, i;
|
||||
|
||||
if (get_user(index, &c->index) ||
|
||||
__get_user(count, &c->count) ||
|
||||
|
|
@ -161,7 +161,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
|
|||
unsigned char __user *ugreen;
|
||||
unsigned char __user *ublue;
|
||||
struct fb_cmap *cmap = &info->cmap;
|
||||
int index, count, i;
|
||||
unsigned int index, count, i;
|
||||
u8 red, green, blue;
|
||||
|
||||
if (get_user(index, &c->index) ||
|
||||
|
|
|
|||
Loading…
Reference in a new issue