diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/Kconfig | 10 | ||||
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index ed1899d307db..be3fd9bce573 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -11,14 +11,14 @@ config USB_EHCI_HCD | |||
11 | The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 | 11 | The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 |
12 | "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. | 12 | "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. |
13 | If your USB host controller supports USB 2.0, you will likely want to | 13 | If your USB host controller supports USB 2.0, you will likely want to |
14 | configure this Host Controller Driver. At this writing, the primary | 14 | configure this Host Controller Driver. At the time of this writing, |
15 | implementation of EHCI is a chip from NEC, widely available in add-on | 15 | the primary implementation of EHCI is a chip from NEC, widely available |
16 | PCI cards, but implementations are in the works from other vendors | 16 | in add-on PCI cards, but implementations are in the works from other |
17 | including Intel and Philips. Motherboard support is appearing. | 17 | vendors including Intel and Philips. Motherboard support is appearing. |
18 | 18 | ||
19 | EHCI controllers are packaged with "companion" host controllers (OHCI | 19 | EHCI controllers are packaged with "companion" host controllers (OHCI |
20 | or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports | 20 | or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports |
21 | will connect to EHCI if it the device is high speed, otherwise they | 21 | will connect to EHCI if the device is high speed, otherwise they |
22 | connect to a companion controller. If you configure EHCI, you should | 22 | connect to a companion controller. If you configure EHCI, you should |
23 | probably configure the OHCI (for NEC and some other vendors) USB Host | 23 | probably configure the OHCI (for NEC and some other vendors) USB Host |
24 | Controller Driver or UHCI (for Via motherboards) Host Controller | 24 | Controller Driver or UHCI (for Via motherboards) Host Controller |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index af18355e94cc..4e9637eb6137 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -357,7 +357,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m | |||
357 | } while (retval != 5 && retval != ENODEV); | 357 | } while (retval != 5 && retval != ENODEV); |
358 | 358 | ||
359 | if (retval != 5) { | 359 | if (retval != 5) { |
360 | err("%s - failed to retreive serial line settings - %d", __FUNCTION__, retval); | 360 | err("%s - failed to retrieve serial line settings - %d", __FUNCTION__, retval); |
361 | return retval; | 361 | return retval; |
362 | } else { | 362 | } else { |
363 | spin_lock_irqsave(&priv->lock, flags); | 363 | spin_lock_irqsave(&priv->lock, flags); |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 8bc8337c99c4..4dd6865d32b0 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -584,7 +584,7 @@ static struct usb_serial_driver *search_serial_device(struct usb_interface *ifac | |||
584 | const struct usb_device_id *id; | 584 | const struct usb_device_id *id; |
585 | struct usb_serial_driver *t; | 585 | struct usb_serial_driver *t; |
586 | 586 | ||
587 | /* List trough know devices and see if the usb id matches */ | 587 | /* Check if the usb id matches a known device */ |
588 | list_for_each(p, &usb_serial_driver_list) { | 588 | list_for_each(p, &usb_serial_driver_list) { |
589 | t = list_entry(p, struct usb_serial_driver, driver_list); | 589 | t = list_entry(p, struct usb_serial_driver, driver_list); |
590 | id = usb_match_id(iface, t->id_table); | 590 | id = usb_match_id(iface, t->id_table); |