xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

Browse Source
This commit is contained in:
Dmitry Torokhov
2005-12-20 23:03:50 -05:00
parent 56f0356321 b05948d9b7
commit 041387d984
390 changed files with 5999 additions and 5553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/input/hid-core.c
View File

@@ -893,8 +893,10 @@ static int hid_input_report(int type, struct urb *urb, int interrupt, struct pt_
size = ((report->size - 1) >> 3) + 1;
if (len < size)
if (len < size) {
dbg("report %d is too short, (%d < %d)", report->id, len, size);
memset(data + len, 0, size - len);
}
if (hid->claimed & HID_CLAIMED_HIDDEV)
hiddev_report_event(hid, report);

1
drivers/usb/input/hid-input.c
View File

@@ -137,6 +137,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
switch (usage->hid & 0xffff) {
case 0xba: map_abs(ABS_RUDDER); break;
case 0xbb: map_abs(ABS_THROTTLE); break;
default: goto ignore;
}
break;