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: 069e8a65cd79 ("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>

diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 4b645db5cd4bcde936c49c773edf770151036226..cc2f462fced2722d97b6bc61053e12fb2ffade91 100644 (file)
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -220,6 +220,15 @@ static const struct hid_device_id hid_quirks[] = {
  * used as a driver. See hid_scan_report().
  */
 static const struct hid_device_id hid_have_special_driver[] = {
+#if IS_ENABLED(CONFIG_APPLEDISPLAY)
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9218) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9219) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x921c) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x921d) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9222) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9226) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, 0x9236) },
+#endif
 #if IS_ENABLED(CONFIG_HID_A4TECH)
        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },