aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/quirks.c3
-rw-r--r--drivers/usb/gadget/function/f_hid.c2
-rw-r--r--drivers/usb/gadget/legacy/zero.c2
-rw-r--r--drivers/usb/host/ehci-sysfs.c2
-rw-r--r--drivers/usb/host/fotg210-hcd.c2
-rw-r--r--drivers/usb/host/fusbh200-hcd.c2
-rw-r--r--drivers/usb/serial/usb-serial-simple.c2
7 files changed, 9 insertions, 6 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 96fafed92b76..0ffb4ed0a945 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -103,6 +103,9 @@ static const struct usb_device_id usb_quirk_list[] = {
103 { USB_DEVICE(0x04f3, 0x009b), .driver_info = 103 { USB_DEVICE(0x04f3, 0x009b), .driver_info =
104 USB_QUIRK_DEVICE_QUALIFIER }, 104 USB_QUIRK_DEVICE_QUALIFIER },
105 105
106 { USB_DEVICE(0x04f3, 0x010c), .driver_info =
107 USB_QUIRK_DEVICE_QUALIFIER },
108
106 { USB_DEVICE(0x04f3, 0x016f), .driver_info = 109 { USB_DEVICE(0x04f3, 0x016f), .driver_info =
107 USB_QUIRK_DEVICE_QUALIFIER }, 110 USB_QUIRK_DEVICE_QUALIFIER },
108 111
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 59ab62c92b66..ea2b9c374305 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -396,7 +396,7 @@ static int hidg_setup(struct usb_function *f,
396 396
397 case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 397 case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8
398 | HID_REQ_SET_REPORT): 398 | HID_REQ_SET_REPORT):
399 VDBG(cdev, "set_report | wLenght=%d\n", ctrl->wLength); 399 VDBG(cdev, "set_report | wLength=%d\n", ctrl->wLength);
400 goto stall; 400 goto stall;
401 break; 401 break;
402 402
diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c
index ebf09f439f3a..ff97ac93ac03 100644
--- a/drivers/usb/gadget/legacy/zero.c
+++ b/drivers/usb/gadget/legacy/zero.c
@@ -28,7 +28,7 @@
28 * 28 *
29 * Why is *this* driver using two configurations, rather than setting up 29 * Why is *this* driver using two configurations, rather than setting up
30 * two interfaces with different functions? To help verify that multiple 30 * two interfaces with different functions? To help verify that multiple
31 * configuration infrastucture is working correctly; also, so that it can 31 * configuration infrastructure is working correctly; also, so that it can
32 * work with low capability USB controllers without four bulk endpoints. 32 * work with low capability USB controllers without four bulk endpoints.
33 */ 33 */
34 34
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index f6459dfb6f54..5e44407aa099 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -132,7 +132,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
132 132
133 if (allocated_max > uframe_periodic_max) { 133 if (allocated_max > uframe_periodic_max) {
134 ehci_info(ehci, 134 ehci_info(ehci,
135 "cannot decrease uframe_periodic_max becase " 135 "cannot decrease uframe_periodic_max because "
136 "periodic bandwidth is already allocated " 136 "periodic bandwidth is already allocated "
137 "(%u > %u)\n", 137 "(%u > %u)\n",
138 allocated_max, uframe_periodic_max); 138 allocated_max, uframe_periodic_max);
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 3de1278677d0..ecf02b2623e8 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -4958,7 +4958,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
4958 4958
4959 if (allocated_max > uframe_periodic_max) { 4959 if (allocated_max > uframe_periodic_max) {
4960 fotg210_info(fotg210, 4960 fotg210_info(fotg210,
4961 "cannot decrease uframe_periodic_max becase " 4961 "cannot decrease uframe_periodic_max because "
4962 "periodic bandwidth is already allocated " 4962 "periodic bandwidth is already allocated "
4963 "(%u > %u)\n", 4963 "(%u > %u)\n",
4964 allocated_max, uframe_periodic_max); 4964 allocated_max, uframe_periodic_max);
diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c
index abe42f31559f..664d2aa1239c 100644
--- a/drivers/usb/host/fusbh200-hcd.c
+++ b/drivers/usb/host/fusbh200-hcd.c
@@ -4893,7 +4893,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
4893 4893
4894 if (allocated_max > uframe_periodic_max) { 4894 if (allocated_max > uframe_periodic_max) {
4895 fusbh200_info(fusbh200, 4895 fusbh200_info(fusbh200,
4896 "cannot decrease uframe_periodic_max becase " 4896 "cannot decrease uframe_periodic_max because "
4897 "periodic bandwidth is already allocated " 4897 "periodic bandwidth is already allocated "
4898 "(%u > %u)\n", 4898 "(%u > %u)\n",
4899 allocated_max, uframe_periodic_max); 4899 allocated_max, uframe_periodic_max);
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index 7064eb8d6142..8bfc47c29828 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -64,7 +64,7 @@ DEVICE(vivopay, VIVOPAY_IDS);
64/* Motorola USB Phone driver */ 64/* Motorola USB Phone driver */
65#define MOTO_IDS() \ 65#define MOTO_IDS() \
66 { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \ 66 { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \
67 { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */ \ 67 { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Motorola phone */ \
68 { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ \ 68 { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ \
69 { USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ \ 69 { USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ \
70 { USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */ 70 { USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */