Skip to content

Commit 37ed68b

Browse files
rxrblnUlrich Hecht
authored andcommitted
HID: quirks: work around VID/PID conflict for appledisplay
[ Upstream commit c7fabe4ad9219866c203164a214c474c95b36bf2 ] For years I wondered why the Apple Cinema Display driver would not just work for me. Turns out the hidraw driver instantly takes it over. Fix by adding appledisplay VID/PIDs to hid_have_special_driver. Fixes: 069e8a6 ("Driver for Apple Cinema Display") Signed-off-by: René Rebe <rene@exactco.de> Signed-off-by: Jiri Kosina <jkosina@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent 9d279b9 commit 37ed68b

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/hid/hid-quirks.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,15 @@ static const struct hid_device_id hid_quirks[] = {
213213
* used as a driver. See hid_scan_report().
214214
*/
215215
static const struct hid_device_id hid_have_special_driver[] = {
216+
#if IS_ENABLED(CONFIG_APPLEDISPLAY)
217+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9218) },
218+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9219) },
219+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x921c) },
220+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x921d) },
221+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9222) },
222+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9226) },
223+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9236) },
224+
#endif
216225
#if IS_ENABLED(CONFIG_HID_A4TECH)
217226
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
218227
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },

0 commit comments

Comments
 (0)