lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina
2010-08-04 15:31:13 +02:00
parent 35d03a0d9b 7d876c05fa 0b3fa399be 70c7c9c443
commit ada8c7973b
11 changed files with 99 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/hid-core.c
View File

@@ -1157,6 +1157,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
if (hdev->quirks & HID_QUIRK_HIDDEV_FORCE)
connect_mask |= (HID_CONNECT_HIDDEV_FORCE | HID_CONNECT_HIDDEV);
if (hdev->quirks & HID_QUIRK_HIDINPUT_FORCE)
connect_mask |= HID_CONNECT_HIDINPUT_FORCE;
if (hdev->bus != BUS_USB)
connect_mask &= ~HID_CONNECT_HIDDEV;
if (hid_hiddev(hdev))