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 7F3B02E92BA; Thu, 28 May 2026 20:51:05 +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=1780001466; cv=none; b=gPe+azEQaQbQFUZSWlG/nfWestnbsvebrOlfA33JrpAmmn4J5gbWi3M0A3smRnfR7mZ39T1rgdI/dLuxTAKD8TqgolWHDAJ6+ecrUnsipUWfxaj2xZeYqRcyGw8dPI3De4xSM5I53OccM5LOO9Pv0zT4IHrBqsZdgl8avvcBChw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001466; c=relaxed/simple; bh=DPaMAzXwO9x2tWgXFO9NRmTYhW3RM+xMcfepOzOSuyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g87psmSxR/9LdgSXqbc40HWBwU5vVFN4g6xh1OAzgQCusrGPfaFCdzNU7tKEoMHEKT/A40dRPl6AXgEF26evVK9bvQ9aHyTGyJf+ELMFNFtuf+tRYJeG4ZinvsEHhC2wzXC12o9OIsHM4YCEC0taH3fIfuR1mJtv4u+ZrLC48zE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1ADcHd0Y; 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="1ADcHd0Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E3111F000E9; Thu, 28 May 2026 20:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780001465; bh=ddLCLnVnTkMWvIO3ZicetGtzWAdjcb5ZjnVYVi1DY/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1ADcHd0YCVDW97I22uIh6dwovtOG3kMFB62JCiyL68vCbNSHoKhMCsxQoRv83mFxr ZfUEOR1l709TGBwv4GsMcv2hRsuvsI2wf5rbo8QpOzoZf5BlurRc7xoqtfbA1bdYgB VbOE0clx9aU9i8a5+k/sNTWkNFvHK3T0Vm/ZDRj0= 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 6.6 136/186] HID: quirks: really enable the intended work around for appledisplay Date: Thu, 28 May 2026 21:50:16 +0200 Message-ID: <20260528194932.624435136@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194928.941004471@linuxfoundation.org> References: <20260528194928.941004471@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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 d9e33dde89899..9d396d2e534d0 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