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

Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic-merge', 'for-4.1/i2c-hid', 'for-4.1/kconfig-drop-expert-dependency', 'for-4.1/logitech', 'for-4.1/multitouch', 'for-4.1/rmi', 'for-4.1/sony', 'for-4.1/upstream' and 'for-4.1/wacom' into for-linus

Browse Source
This commit is contained in:
Jiri Kosina
2015-04-13 23:41:15 +02:00
parent 43faadfe96 feb6faf1e5 ee20fe2386 a485923efb 7af05e73cd b832da5602 2c6e0277e1 f097deef59 2e701a359a 8fec02a73e b4bf2120d4
commit 05f6d02521
7668 changed files with 355416 additions and 185556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/hid-debug.c
View File

@@ -165,6 +165,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
{0, 0x53, "DeviceIndex"},
{0, 0x54, "ContactCount"},
{0, 0x55, "ContactMaximumNumber"},
{0, 0x59, "ButtonType"},
{0, 0x5A, "SecondaryBarrelSwitch"},
{0, 0x5B, "TransducerSerialNumber"},
{ 15, 0, "PhysicalInterfaceDevice" },
@@ -1127,7 +1128,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
if (!list->hdev || !list->hdev->debug) {
ret = -EIO;
break;
set_current_state(TASK_RUNNING);
goto out;
}
/* allow O_NONBLOCK from other threads */