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 635B71DE4E0; Thu, 28 May 2026 20:43:32 +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=1780001013; cv=none; b=E4vCu8t5z4YzECWJmu629OuC/QOXE29c8OO2NnpmrEZ97ho0ve1BOH/fgxQ5isUXu2R/V7I40+adljhYiDJInI5St8k1A7IL6EONuy5bZLk4+ia3hEBOPVkedY87UDxw/l9pXxafBy65gl9OAxFfmneWtX5vu4fCcMIX4MWtlqg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001013; c=relaxed/simple; bh=Yn5oixhCwPkMCneptFp6bsyyp/jRM2puwplT0536Cs0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oKMu/U9xq0HtRstpCwIv2nXHktJ6YwfVMezogN7Fxzy1nSEUrYUp5+bnR4PXNQH7M07a4li2b71mb/unMhzB2czZVyal+NK17KsemTb4elKiWjoEaUX6ELK8N8xFyuY5pATtdNlswYQUXIPUo6L0zVvs69f+bpg3bcuuFsAso88= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HAAypgpo; 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="HAAypgpo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C04691F000E9; Thu, 28 May 2026 20:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780001012; bh=nhYJtjNL5Zsch4x6KwKTFm2YElSEV8ITpKOTeut1c/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HAAypgpongsoBlXweYw69hgflFUXHtvWCNLTCxxrPl7lXSBHIUaRUUvTVC9gWHfQ1 i4eJLUW8NC8+EFMdrrQ8xHRc3as+/DZrtjLuvaoSJ88AV+pyOJ73+jJuxeeU+1KJZj Aj1t1CVIC+pMU93axKcFWKz4JejVIQlw7uLCqZhU= 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.12 212/272] HID: quirks: really enable the intended work around for appledisplay Date: Thu, 28 May 2026 21:49:46 +0200 Message-ID: <20260528194635.158626087@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@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.12-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