[PATCH] HID: quirks: really enable the intended work around for appledisplay

Lukas Bulwahn posted 1 patch 2 days ago
drivers/hid/hid-quirks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] HID: quirks: really enable the intended work around for appledisplay
Posted by Lukas Bulwahn 2 days ago
From: Lukas Bulwahn <lukas.bulwahn@redhat.com>

Commit c7fabe4ad921 ("HID: quirks: work around VID/PID conflict for
appledisplay") intends to add a quirk for kernels built with Apple Cinema
Display support, but it refers to the non-existing config option
CONFIG_APPLEDISPLAY, whereas the config option for Apple Cinema Display
support is named CONFIG_USB_APPLEDISPLAY.

Refer to the intended config option CONFIG_USB_APPLEDISPLAY in the ifdef
directive.

Fixes: c7fabe4ad921 ("HID: quirks: work around VID/PID conflict for appledisplay")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com>
---

Note this fix suggests that the patch of commit c7fabe4ad921 in this form
was never effectively tested, checking the effect that the commit message
claims it would have.

 drivers/hid/hid-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 3217e436c052..b91e081ef69c 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -233,7 +233,7 @@ 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)
+#if IS_ENABLED(CONFIG_USB_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) },
-- 
2.52.0
Re: [PATCH] HID: quirks: really enable the intended work around for appledisplay
Posted by René Rebe 1 day, 23 hours ago
Hi,

> On 5. Feb 2026, at 09:11, Lukas Bulwahn <lbulwahn@redhat.com> wrote:
> 
> From: Lukas Bulwahn <lukas.bulwahn@redhat.com>
> 
> Commit c7fabe4ad921 ("HID: quirks: work around VID/PID conflict for
> appledisplay") intends to add a quirk for kernels built with Apple Cinema
> Display support, but it refers to the non-existing config option
> CONFIG_APPLEDISPLAY, whereas the config option for Apple Cinema Display
> support is named CONFIG_USB_APPLEDISPLAY.
> 
> Refer to the intended config option CONFIG_USB_APPLEDISPLAY in the ifdef
> directive.
> 
> Fixes: c7fabe4ad921 ("HID: quirks: work around VID/PID conflict for appledisplay")
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com>
> ---
> 
> Note this fix suggests that the patch of commit c7fabe4ad921 in this form
> was never effectively tested, checking the effect that the commit message
> claims it would have.

Thanks for spotting this. It was tested when I did this years ago. Though, maybe I
tested before adding the #if IS_ENABLED, anciently hit some key in Vim, o
something was renamed since then.

Either way, I’ll get the display out of the basement and re-test it the coming days.

	René

> drivers/hid/hid-quirks.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 3217e436c052..b91e081ef69c 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -233,7 +233,7 @@ 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)
> +#if IS_ENABLED(CONFIG_USB_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) },
> -- 
> 2.52.0
> 

-- 
https://exactco.de • https://t2linux.com • https://patreon.com/renerebe