USB: cdc-acm: Fix bit overlap and move quirk definitions to header

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 <stable@kernel.org>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Link: https://patch.msgid.link/20260522091357.1301196-1-guanwentao@uniontech.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 54059e4fc6ed72dc2dcff35fb59fc9c45ef13bde..ddf0b59638595e39cea000174c7788543738e4d2 100644 (file)
--- 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 request, int value,
        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;
 

diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 25fd5329a8781fbbfa41c146ea685c3fde510786..01f448a783c031e97e39c11ced399c51dc529bd3 100644 (file)
--- 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 */