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 408173C09F3; Tue, 16 Jun 2026 16:48:09 +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=1781628491; cv=none; b=JabbW/35qi8h4TZshV/mwa2TtVRjClBS3xH9r6kuORd1EZF/1JBFKVl2gxrJiu8beFm2c6ENLNNUC6D64IVEJDU+H+93Cze9qFRKga0y5UlbiU8vug8CVP3adQa4iPOxjCU6LUn15hyqJ+WNbxMCD2MCMJ3egvji4sfvNsz9ME0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628491; c=relaxed/simple; bh=yjcmOAtN8irnEMCZbv6rjo8aMLErmvp7F2v9m301gSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F3KAuvlGGXQrjmmQDwq1iYZ1g/nsXXTQClrYgYrROwZ6oO7ChagaiE6qQZiSdR8ZZkwek3nNdxAbaN/531E5g1DTpMLT2jg2nxovL6RkMtUZuAHQfYxxXV9OyOlWGn81kp32dcwVJZBksljAVX/G8J84ANcIt79qSTAr1u5yfTo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KYB0X2Xi; 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="KYB0X2Xi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB6D11F000E9; Tue, 16 Jun 2026 16:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781628489; bh=jo+blF2D6dm23fYg18hcSWBBpTOYyawPP6uGTyXJUb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KYB0X2Xir1GwWQn6pVTJS7ENcM8EgepzIBHuFt+/4wsFKXNJDlT9GPFz2Bhz3zO16 UGdBS84bPl8Dh9sqdoX6BMw8M3v1Y6t+KGRIDAnAyEnQ/omIQBSG1Xty0AHTn3GJNB 3cyoo/wDD6qcqPUBujhaz9kDJFtQJhjAGT2WqEnY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Wentao Guan Subject: [PATCH 6.6 104/452] USB: cdc-acm: Fix bit overlap and move quirk definitions to header Date: Tue, 16 Jun 2026 20:25:31 +0530 Message-ID: <20260616145123.252994918@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145117.796205997@linuxfoundation.org> References: <20260616145117.796205997@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: Wentao Guan commit 5eb070769ea5e18405535609d1d3f6886f3755bd upstream. The VENDOR_CLASS_DATA_IFACE and ALWAYS_POLL_CTRL quirk flags added in commit f58752ebcb35 ("USB: cdc-acm: Add quirks for Yoga Book 9 14IAH10 INGENIC touchscreen") were placed inside the acm_ctrl_msg() function rather than in the header with the other quirk flags. Then, their values (BIT(9) and BIT(10)) collided with NO_UNION_12 which is already BIT(9). Move the definitions to drivers/usb/class/cdc-acm.h where they belong and shift them to BIT(10) and BIT(11) to avoid the overlap. Fixes: f58752ebcb35 ("USB: cdc-acm: Add quirks for Yoga Book 9 14IAH10 INGENIC touchscreen") Cc: stable Signed-off-by: Wentao Guan Link: https://patch.msgid.link/20260522091357.1301196-1-guanwentao@uniontech.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-acm.c | 2 -- drivers/usb/class/cdc-acm.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -114,8 +114,6 @@ static int acm_ctrl_msg(struct acm *acm, int retval; retval = usb_autopm_get_interface(acm->control); -#define VENDOR_CLASS_DATA_IFACE BIT(9) /* data interface uses vendor-specific class */ -#define ALWAYS_POLL_CTRL BIT(10) /* keep ctrl URB active even without an open TTY */ if (retval) return retval; --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -115,3 +115,5 @@ struct acm { #define DISABLE_ECHO BIT(7) #define MISSING_CAP_BRK BIT(8) #define NO_UNION_12 BIT(9) +#define VENDOR_CLASS_DATA_IFACE BIT(10) /* data interface uses vendor-specific class */ +#define ALWAYS_POLL_CTRL BIT(11) /* keep ctrl URB active even without an open TTY */