usb: core: Add USB_QUIRK_DELAY_CTRL_MSG to usbcore quirks

BugLink: https://bugs.launchpad.net/bugs/1762695
There's a new quirk, USB_QUIRK_DELAY_CTRL_MSG. Add it to usbcore quirks
for completeness.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4d8d5a392ae110d9b5889afd2b4beef9a09e712d)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4dbf6056da2a8f5ae19ea5ddc80ffac47ff9a8d9..f49ba96f88812442953e4f48ca908f734970b9ac 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4408,7 +4408,9 @@
                                        calculation);
                                m = USB_QUIRK_DISCONNECT_SUSPEND (Device needs
                                        to be disconnected before suspend to
-                                       prevent spurious wakeup)
+                                       prevent spurious wakeup);
+                               n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a
+                                       pause after every control message);
                        Example: quirks=0781:5580:bk,0a5c:5834:gij
 
        usbhid.mousepoll=

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 29e5f32b38df6b2f1e3969523ddb7160e2014f66..920f48a49a87021a513b4e395a903044a558abf5 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -124,6 +124,9 @@ static int quirks_param_set(const char *val, const struct kernel_param *kp)
                        case 'm':
                                flags |= USB_QUIRK_DISCONNECT_SUSPEND;
                                break;
+                       case 'n':
+                               flags |= USB_QUIRK_DELAY_CTRL_MSG;
+                               break;
                        /* Ignore unrecognized flag characters */
                        }
                }