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 D4AC3233D9E; Sat, 30 May 2026 18:20:03 +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=1780165204; cv=none; b=HH2P8KZQe59oQz4B9p74nuL34I33eqaeSwTcFDR4Kh2GsQlOSeTf3uCADoW6S1Io2E6k4JwO8wq3hvkMEx7+uYozBmGYN3Wwqlz44Pag0G25rYNT92hkQbfD6wSTTW5MS7MkXuuvgwd7Ti2boOjG5TEWaMl2m2Z1cJrWubY5TnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780165204; c=relaxed/simple; bh=xvavtGN4xyQLMkYrx6o5NWy6ptPVGXJac3TCbKJKPrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YuFxGa6xWhOxYdAzMFmSkTrBNdV7lYzLNhjQ9ExebBYEjXtNj8rx3G0N+hBhh0YjFL6bFbdKjh0eQhHr9yqu/TFZzqYYcVXUQ3DM47MtKKjbH8d1RR4oYu4LK8j1FafdDeCcyFPRPJioLFlkb8+5DKyxqjngipLGk8jivou7v7M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rn3a9pam; 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="rn3a9pam" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 255011F00893; Sat, 30 May 2026 18:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780165203; bh=BvG1ohil4A5hki7LUQPfCdSGSDtMco6YePEUuP+iYTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rn3a9pamBJ9NKeYGxvPIkmJvXkHKss8pJFbp6s9Qn/NXp6dvQjtxiCqMRrHGcYYwM V2PT8YhZUhLds2IDRix9neiwwX8Cqid8LVTD7PZG/JSNVW/gNQwH+Ttz8Q0Rou0Q5y rgyDnzGSisizB6pv9CdH9Mhl2D9kZtlwMkHz8boY= 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 5.15 753/776] HID: quirks: really enable the intended work around for appledisplay Date: Sat, 30 May 2026 18:07:47 +0200 Message-ID: <20260530160259.219109046@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@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 5.15-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 9eb4d02cc6d77..6e9501fe1a281 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -222,7 +222,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