aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/Kconfig1
-rw-r--r--drivers/usb/gadget/s3c2410_udc.c4
-rw-r--r--drivers/usb/gadget/s3c2410_udc.h2
-rw-r--r--drivers/usb/host/hwa-hc.c2
-rw-r--r--drivers/usb/host/imx21-hcd.c2
-rw-r--r--drivers/usb/musb/cppi_dma.c2
-rw-r--r--drivers/usb/otg/fsl_otg.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h6
-rw-r--r--drivers/usb/storage/isd200.c2
-rw-r--r--drivers/usb/storage/unusual_devs.h2
10 files changed, 12 insertions, 13 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 23a447373c51..12a401a144b7 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -264,7 +264,6 @@ config USB_PXA27X
264config USB_S3C_HSOTG 264config USB_S3C_HSOTG
265 tristate "S3C HS/OtG USB Device controller" 265 tristate "S3C HS/OtG USB Device controller"
266 depends on S3C_DEV_USB_HSOTG 266 depends on S3C_DEV_USB_HSOTG
267 select USB_GADGET_S3C_HSOTG_PIO
268 select USB_GADGET_DUALSPEED 267 select USB_GADGET_DUALSPEED
269 help 268 help
270 The Samsung S3C64XX USB2.0 high-speed gadget controller 269 The Samsung S3C64XX USB2.0 high-speed gadget controller
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index b8643771fa80..fac4c650d4bb 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Samsung S3C24xx series on-chip full speed USB device controllers 4 * Samsung S3C24xx series on-chip full speed USB device controllers
5 * 5 *
6 * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard 6 * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
7 * Additional cleanups by Ben Dooks <ben-linux@fluff.org> 7 * Additional cleanups by Ben Dooks <ben-linux@fluff.org>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
51 51
52#define DRIVER_DESC "S3C2410 USB Device Controller Gadget" 52#define DRIVER_DESC "S3C2410 USB Device Controller Gadget"
53#define DRIVER_VERSION "29 Apr 2007" 53#define DRIVER_VERSION "29 Apr 2007"
54#define DRIVER_AUTHOR "Herbert Pötzl <herbert@13thfloor.at>, " \ 54#define DRIVER_AUTHOR "Herbert Pötzl <herbert@13thfloor.at>, " \
55 "Arnaud Patard <arnaud.patard@rtp-net.org>" 55 "Arnaud Patard <arnaud.patard@rtp-net.org>"
56 56
57static const char gadget_name[] = "s3c2410_udc"; 57static const char gadget_name[] = "s3c2410_udc";
diff --git a/drivers/usb/gadget/s3c2410_udc.h b/drivers/usb/gadget/s3c2410_udc.h
index a48f619cb1cc..1653bae08b80 100644
--- a/drivers/usb/gadget/s3c2410_udc.h
+++ b/drivers/usb/gadget/s3c2410_udc.h
@@ -2,7 +2,7 @@
2 * linux/drivers/usb/gadget/s3c2410_udc.h 2 * linux/drivers/usb/gadget/s3c2410_udc.h
3 * Samsung on-chip full speed USB device controllers 3 * Samsung on-chip full speed USB device controllers
4 * 4 *
5 * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard 5 * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
6 * Additional cleanups by Ben Dooks <ben-linux@fluff.org> 6 * Additional cleanups by Ben Dooks <ben-linux@fluff.org>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index 056fb2d37c88..43b3ca48d753 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -481,7 +481,7 @@ static int __hwahc_op_set_ptk(struct wusbhc *wusbhc, u8 port_idx, u32 tkid,
481 encryption_value = 0; 481 encryption_value = 0;
482 } 482 }
483 483
484 /* Set the encryption type for commmunicating with the device */ 484 /* Set the encryption type for communicating with the device */
485 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0), 485 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
486 USB_REQ_SET_ENCRYPTION, 486 USB_REQ_SET_ENCRYPTION,
487 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, 487 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 2ee18cfa1efe..dbf0f156ed9e 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -473,7 +473,7 @@ static void free_epdmem(struct imx21 *imx21, struct usb_host_endpoint *ep)
473/* End handling */ 473/* End handling */
474/* =========================================== */ 474/* =========================================== */
475 475
476/* Endpoint now idle - release it's ETD(s) or asssign to queued request */ 476/* Endpoint now idle - release its ETD(s) or assign to queued request */
477static void ep_idle(struct imx21 *imx21, struct ep_priv *ep_priv) 477static void ep_idle(struct imx21 *imx21, struct ep_priv *ep_priv)
478{ 478{
479 int i; 479 int i;
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index 318fb4e8a885..53be7aef6308 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -513,7 +513,7 @@ static inline int cppi_autoreq_update(struct cppi_channel *rx,
513 if (!(val & MUSB_RXCSR_H_REQPKT)) { 513 if (!(val & MUSB_RXCSR_H_REQPKT)) {
514 val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; 514 val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS;
515 musb_writew(regs, MUSB_RXCSR, val); 515 musb_writew(regs, MUSB_RXCSR, val);
516 /* flush writebufer */ 516 /* flush writebuffer */
517 val = musb_readw(regs, MUSB_RXCSR); 517 val = musb_readw(regs, MUSB_RXCSR);
518 } 518 }
519 } 519 }
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index 0f420b25e9a9..2d9cc445fc73 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -639,7 +639,7 @@ static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA)
639 * Delayed pin detect interrupt processing. 639 * Delayed pin detect interrupt processing.
640 * 640 *
641 * When the Mini-A cable is disconnected from the board, 641 * When the Mini-A cable is disconnected from the board,
642 * the pin-detect interrupt happens before the disconnnect 642 * the pin-detect interrupt happens before the disconnect
643 * interrupts for the connected device(s). In order to 643 * interrupts for the connected device(s). In order to
644 * process the disconnect interrupt(s) prior to switching 644 * process the disconnect interrupt(s) prior to switching
645 * roles, the pin-detect interrupts are delayed, and handled 645 * roles, the pin-detect interrupts are delayed, and handled
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 055b64ef0bba..df1d7da933ec 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -2,7 +2,7 @@
2 * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. 2 * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters.
3 * Please keep numerically sorted within individual areas, thanks! 3 * Please keep numerically sorted within individual areas, thanks!
4 * 4 *
5 * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais 5 * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
6 * from Rudolf Gugler 6 * from Rudolf Gugler
7 * 7 *
8 */ 8 */
@@ -78,7 +78,7 @@
78 */ 78 */
79#define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ 79#define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */
80 80
81/* www.starting-point-systems.com µChameleon device */ 81/* www.starting-point-systems.com µChameleon device */
82#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ 82#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */
83 83
84/* 84/*
@@ -291,7 +291,7 @@
291 291
292/* 292/*
293 * Teratronik product ids. 293 * Teratronik product ids.
294 * Submitted by O. Wölfelschneider. 294 * Submitted by O. Wölfelschneider.
295 */ 295 */
296#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ 296#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */
297#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ 297#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6d6923317f10..93d359f4d6a7 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -61,7 +61,7 @@
61#include "scsiglue.h" 61#include "scsiglue.h"
62 62
63MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); 63MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC");
64MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>"); 64MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>");
65MODULE_LICENSE("GPL"); 65MODULE_LICENSE("GPL");
66 66
67static int isd200_Initialization(struct us_data *us); 67static int isd200_Initialization(struct us_data *us);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 24caba79d722..856ad92c40de 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1914,7 +1914,7 @@ UNUSUAL_DEV( 0x1b1c, 0x1ab5, 0x0200, 0x0200,
1914 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 1914 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
1915 US_FL_INITIAL_READ10 ), 1915 US_FL_INITIAL_READ10 ),
1916 1916
1917/* Patch by Richard Schütz <r.schtz@t-online.de> 1917/* Patch by Richard Schütz <r.schtz@t-online.de>
1918 * This external hard drive enclosure uses a JMicron chip which 1918 * This external hard drive enclosure uses a JMicron chip which
1919 * needs the US_FL_IGNORE_RESIDUE flag to work properly. */ 1919 * needs the US_FL_IGNORE_RESIDUE flag to work properly. */
1920UNUSUAL_DEV( 0x1e68, 0x001b, 0x0000, 0x0000, 1920UNUSUAL_DEV( 0x1e68, 0x001b, 0x0000, 0x0000,