From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A4452FD7C3; Thu, 28 May 2026 20:06:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779998761; cv=none; b=ctFjwGzmOU58OTtAActJ1VbgDXjABqMm7HBt7qUUqJM182+SA3dgDAcoZHWLhPKohcOA1tM1qcOQcUDZkgpVpyzMkwkbO8JiqrJmTdSqj6ZdIlXE4dpTOMEBrF0N0SWeohhCsWrKL44ADE0kaTnpTutrtv4gKDnP25hs7MSiDjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779998761; c=relaxed/simple; bh=9nqwPMseKq+THY8scm1KqPfytR2GJrVCHn4e2vPDOX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LcNHqewbaPqvMpev/8BeYt6DVd6L4FFWq2L6lRE+hL0en7H1PGbufUbPRNM7y6TnXV5TQaCOcN0J7ga8q/oaEatZVgdqahseTEIiUqfp6w0zrNOhRmW/GLuZvTLVIuUjg1etyllDLcaJfw+jOVlZSOmctm2hS9aQEMt5pV1CCnA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vk4H02lP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Vk4H02lP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8D311F000E9; Thu, 28 May 2026 20:05:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779998760; bh=tKwZqx4oBvnfqTpkTDVaoVUbNoR1fMcVnu103wJSNgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Vk4H02lPuFwA8jGK8f4qMsYRf5bO7EmwYXHnuQ3MUU24Xw9Ls5TifbbN0oDZCzTBD /44woy6BIeMCkC4N8WpN18MeSf3Fatwu/ZReOxYGNav304s7MV4BeUHQulsWFjZeVl KaKGKhQYkOhVifYmRQftwJHCjedKzWuT86aONCeM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lukas Bulwahn , Jiri Kosina , Sasha Levin Subject: [PATCH 7.0 289/461] HID: quirks: really enable the intended work around for appledisplay Date: Thu, 28 May 2026 21:46:58 +0200 Message-ID: <20260528194655.582153323@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194646.819809818@linuxfoundation.org> References: <20260528194646.819809818@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lukas Bulwahn [ Upstream commit 5f90dcfa8dc32a488581b78e575cdd7808ba5c78 ] 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 Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- 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 02f7db5c10564..5e754b0a50325 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -234,7 +234,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.53.0