aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/atm/ueagle-atm.c8
-rw-r--r--drivers/usb/c67x00/c67x00-drv.c2
-rw-r--r--drivers/usb/c67x00/c67x00-hcd.h2
-rw-r--r--drivers/usb/c67x00/c67x00-sched.c2
-rw-r--r--drivers/usb/class/cdc-acm.h2
-rw-r--r--drivers/usb/class/usbtmc.c2
-rw-r--r--drivers/usb/core/hcd.c2
-rw-r--r--drivers/usb/core/hub.c2
-rw-r--r--drivers/usb/early/ehci-dbgp.c2
-rw-r--r--drivers/usb/gadget/amd5536udc.c14
-rw-r--r--drivers/usb/gadget/amd5536udc.h2
-rw-r--r--drivers/usb/gadget/at91_udc.c2
-rw-r--r--drivers/usb/gadget/composite.c6
-rw-r--r--drivers/usb/gadget/f_audio.c2
-rw-r--r--drivers/usb/gadget/f_ncm.c2
-rw-r--r--drivers/usb/gadget/fsl_qe_udc.h6
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c6
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.h4
-rw-r--r--drivers/usb/gadget/gmidi.c2
-rw-r--r--drivers/usb/gadget/langwell_udc.c2
-rw-r--r--drivers/usb/gadget/mv_udc_core.c6
-rw-r--r--drivers/usb/gadget/net2280.c2
-rw-r--r--drivers/usb/gadget/nokia.c2
-rw-r--r--drivers/usb/gadget/printer.c2
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c12
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c18
-rw-r--r--drivers/usb/host/Kconfig2
-rw-r--r--drivers/usb/host/ehci.h2
-rw-r--r--drivers/usb/host/fhci-hcd.c2
-rw-r--r--drivers/usb/host/fhci-tds.c8
-rw-r--r--drivers/usb/host/fhci.h4
-rw-r--r--drivers/usb/host/imx21-hcd.c2
-rw-r--r--drivers/usb/host/isp116x.h2
-rw-r--r--drivers/usb/host/isp1362-hcd.c2
-rw-r--r--drivers/usb/host/ohci-hcd.c2
-rw-r--r--drivers/usb/host/oxu210hp-hcd.c4
-rw-r--r--drivers/usb/host/whci/qset.c2
-rw-r--r--drivers/usb/host/xhci.c4
-rw-r--r--drivers/usb/host/xhci.h2
-rw-r--r--drivers/usb/image/microtek.c8
-rw-r--r--drivers/usb/misc/iowarrior.c2
-rw-r--r--drivers/usb/otg/isp1301_omap.c2
-rw-r--r--drivers/usb/otg/langwell_otg.c4
-rw-r--r--drivers/usb/serial/aircable.c4
-rw-r--r--drivers/usb/serial/cp210x.c2
-rw-r--r--drivers/usb/serial/cypress_m8.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/io_edgeport.c2
-rw-r--r--drivers/usb/serial/io_edgeport.h2
-rw-r--r--drivers/usb/serial/io_ti.c2
-rw-r--r--drivers/usb/serial/opticon.c2
-rw-r--r--drivers/usb/storage/ene_ub6250.c4
-rw-r--r--drivers/usb/storage/isd200.c2
-rw-r--r--drivers/usb/storage/scsiglue.c2
-rw-r--r--drivers/usb/storage/shuttle_usbat.c2
-rw-r--r--drivers/usb/wusbcore/crypto.c4
-rw-r--r--drivers/usb/wusbcore/reservation.c2
-rw-r--r--drivers/usb/wusbcore/rh.c2
-rw-r--r--drivers/usb/wusbcore/wa-rpipe.c2
-rw-r--r--drivers/usb/wusbcore/wa-xfer.c8
-rw-r--r--drivers/usb/wusbcore/wusbhc.h2
61 files changed, 108 insertions, 108 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b268e9fccb4..e71521ce301 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1283,7 +1283,7 @@ static void uea_set_bulk_timeout(struct uea_softc *sc, u32 dsrate)
1283 1283
1284 /* in bulk mode the modem have problem with high rate 1284 /* in bulk mode the modem have problem with high rate
1285 * changing internal timing could improve things, but the 1285 * changing internal timing could improve things, but the
1286 * value is misterious. 1286 * value is mysterious.
1287 * ADI930 don't support it (-EPIPE error). 1287 * ADI930 don't support it (-EPIPE error).
1288 */ 1288 */
1289 1289
@@ -1743,7 +1743,7 @@ static int uea_send_cmvs_e1(struct uea_softc *sc)
1743 goto out; 1743 goto out;
1744 } 1744 }
1745 } else { 1745 } else {
1746 /* This realy should not happen */ 1746 /* This really should not happen */
1747 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver); 1747 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver);
1748 goto out; 1748 goto out;
1749 } 1749 }
@@ -1798,7 +1798,7 @@ static int uea_send_cmvs_e4(struct uea_softc *sc)
1798 goto out; 1798 goto out;
1799 } 1799 }
1800 } else { 1800 } else {
1801 /* This realy should not happen */ 1801 /* This really should not happen */
1802 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver); 1802 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver);
1803 goto out; 1803 goto out;
1804 } 1804 }
@@ -1829,7 +1829,7 @@ static int uea_start_reset(struct uea_softc *sc)
1829 1829
1830 /* mask interrupt */ 1830 /* mask interrupt */
1831 sc->booting = 1; 1831 sc->booting = 1;
1832 /* We need to set this here because, a ack timeout could have occured, 1832 /* We need to set this here because, a ack timeout could have occurred,
1833 * but before we start the reboot, the ack occurs and set this to 1. 1833 * but before we start the reboot, the ack occurs and set this to 1.
1834 * So we will failed to wait Ready CMV. 1834 * So we will failed to wait Ready CMV.
1835 */ 1835 */
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index b6d49234e52..62050f7a4f9 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -27,7 +27,7 @@
27 * the link between the common hardware parts and the subdrivers (e.g. 27 * the link between the common hardware parts and the subdrivers (e.g.
28 * interrupt handling). 28 * interrupt handling).
29 * 29 *
30 * The c67x00 has 2 SIE's (serial interface engine) wich can be configured 30 * The c67x00 has 2 SIE's (serial interface engine) which can be configured
31 * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG). 31 * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG).
32 * 32 *
33 * Depending on the platform configuration, the SIE's are created and 33 * Depending on the platform configuration, the SIE's are created and
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h
index 74e44621e31..e3d493d4d61 100644
--- a/drivers/usb/c67x00/c67x00-hcd.h
+++ b/drivers/usb/c67x00/c67x00-hcd.h
@@ -34,7 +34,7 @@
34/* 34/*
35 * The following parameters depend on the CPU speed, bus speed, ... 35 * The following parameters depend on the CPU speed, bus speed, ...
36 * These can be tuned for specific use cases, e.g. if isochronous transfers 36 * These can be tuned for specific use cases, e.g. if isochronous transfers
37 * are very important, bandwith can be sacrificed to guarantee that the 37 * are very important, bandwidth can be sacrificed to guarantee that the
38 * 1ms deadline will be met. 38 * 1ms deadline will be met.
39 * If bulk transfers are important, the MAX_FRAME_BW can be increased, 39 * If bulk transfers are important, the MAX_FRAME_BW can be increased,
40 * but some (or many) isochronous deadlines might not be met. 40 * but some (or many) isochronous deadlines might not be met.
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c
index f6b3c253f3f..a03fbc15fa9 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -907,7 +907,7 @@ static inline int c67x00_end_of_data(struct c67x00_td *td)
907 907
908/* Remove all td's from the list which come 908/* Remove all td's from the list which come
909 * after last_td and are meant for the same pipe. 909 * after last_td and are meant for the same pipe.
910 * This is used when a short packet has occured */ 910 * This is used when a short packet has occurred */
911static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00, 911static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00,
912 struct c67x00_td *last_td) 912 struct c67x00_td *last_td)
913{ 913{
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 5eeb570b9a6..b4ea54dbf32 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -52,7 +52,7 @@
52 */ 52 */
53 53
54/* 54/*
55 * The only reason to have several buffers is to accomodate assumptions 55 * The only reason to have several buffers is to accommodate assumptions
56 * in line disciplines. They ask for empty space amount, receive our URB size, 56 * in line disciplines. They ask for empty space amount, receive our URB size,
57 * and proceed to issue several 1-character writes, assuming they will fit. 57 * and proceed to issue several 1-character writes, assuming they will fit.
58 * The very first write takes a complete URB. Fortunately, this only happens 58 * The very first write takes a complete URB. Fortunately, this only happens
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 6a54634ab82..385acb895ab 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -483,7 +483,7 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
483 } 483 }
484 484
485 done += n_characters; 485 done += n_characters;
486 /* Terminate if end-of-message bit recieved from device */ 486 /* Terminate if end-of-message bit received from device */
487 if ((buffer[8] & 0x01) && (actual >= n_characters + 12)) 487 if ((buffer[8] & 0x01) && (actual >= n_characters + 12))
488 remaining = 0; 488 remaining = 0;
489 else 489 else
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 02b4dbfa488..8eed05d2383 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -700,7 +700,7 @@ void usb_hcd_poll_rh_status(struct usb_hcd *hcd)
700 /* The USB 2.0 spec says 256 ms. This is close enough and won't 700 /* The USB 2.0 spec says 256 ms. This is close enough and won't
701 * exceed that limit if HZ is 100. The math is more clunky than 701 * exceed that limit if HZ is 100. The math is more clunky than
702 * maybe expected, this is to make sure that all timers for USB devices 702 * maybe expected, this is to make sure that all timers for USB devices
703 * fire at the same time to give the CPU a break inbetween */ 703 * fire at the same time to give the CPU a break in between */
704 if (hcd->uses_new_polling ? HCD_POLL_RH(hcd) : 704 if (hcd->uses_new_polling ? HCD_POLL_RH(hcd) :
705 (length == 0 && hcd->status_urb != NULL)) 705 (length == 0 && hcd->status_urb != NULL))
706 mod_timer (&hcd->rh_timer, (jiffies/(HZ/4) + 1) * (HZ/4)); 706 mod_timer (&hcd->rh_timer, (jiffies/(HZ/4) + 1) * (HZ/4));
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 564eaa5525d..8fb754916c6 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1649,7 +1649,7 @@ void usb_disconnect(struct usb_device **pdev)
1649 1649
1650 /* mark the device as inactive, so any further urb submissions for 1650 /* mark the device as inactive, so any further urb submissions for
1651 * this device (and any of its children) will fail immediately. 1651 * this device (and any of its children) will fail immediately.
1652 * this quiesces everyting except pending urbs. 1652 * this quiesces everything except pending urbs.
1653 */ 1653 */
1654 usb_set_device_state(udev, USB_STATE_NOTATTACHED); 1654 usb_set_device_state(udev, USB_STATE_NOTATTACHED);
1655 dev_info(&udev->dev, "USB disconnect, device number %d\n", 1655 dev_info(&udev->dev, "USB disconnect, device number %d\n",
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
index 0bc06e2bcfc..a6a350f5827 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@ -648,7 +648,7 @@ static int ehci_reset_port(int port)
648 if (!(portsc & PORT_CONNECT)) 648 if (!(portsc & PORT_CONNECT))
649 return -ENOTCONN; 649 return -ENOTCONN;
650 650
651 /* bomb out completely if something weird happend */ 651 /* bomb out completely if something weird happened */
652 if ((portsc & PORT_CSC)) 652 if ((portsc & PORT_CSC))
653 return -EINVAL; 653 return -EINVAL;
654 654
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index f8dd7269d79..6e42aab7580 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -278,7 +278,7 @@ static int udc_enable_dev_setup_interrupts(struct udc *dev)
278 return 0; 278 return 0;
279} 279}
280 280
281/* Calculates fifo start of endpoint based on preceeding endpoints */ 281/* Calculates fifo start of endpoint based on preceding endpoints */
282static int udc_set_txfifo_addr(struct udc_ep *ep) 282static int udc_set_txfifo_addr(struct udc_ep *ep)
283{ 283{
284 struct udc *dev; 284 struct udc *dev;
@@ -2137,7 +2137,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2137 if (use_dma) { 2137 if (use_dma) {
2138 /* BNA event ? */ 2138 /* BNA event ? */
2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) { 2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) {
2140 DBG(dev, "BNA ep%dout occured - DESPTR = %x \n", 2140 DBG(dev, "BNA ep%dout occurred - DESPTR = %x \n",
2141 ep->num, readl(&ep->regs->desptr)); 2141 ep->num, readl(&ep->regs->desptr));
2142 /* clear BNA */ 2142 /* clear BNA */
2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts); 2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts);
@@ -2151,7 +2151,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2151 } 2151 }
2152 /* HE event ? */ 2152 /* HE event ? */
2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) { 2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) {
2154 dev_err(&dev->pdev->dev, "HE ep%dout occured\n", ep->num); 2154 dev_err(&dev->pdev->dev, "HE ep%dout occurred\n", ep->num);
2155 2155
2156 /* clear HE */ 2156 /* clear HE */
2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts); 2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts);
@@ -2354,7 +2354,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2354 /* BNA ? */ 2354 /* BNA ? */
2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) { 2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) {
2356 dev_err(&dev->pdev->dev, 2356 dev_err(&dev->pdev->dev,
2357 "BNA ep%din occured - DESPTR = %08lx \n", 2357 "BNA ep%din occurred - DESPTR = %08lx \n",
2358 ep->num, 2358 ep->num,
2359 (unsigned long) readl(&ep->regs->desptr)); 2359 (unsigned long) readl(&ep->regs->desptr));
2360 2360
@@ -2367,7 +2367,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2367 /* HE event ? */ 2367 /* HE event ? */
2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) { 2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) {
2369 dev_err(&dev->pdev->dev, 2369 dev_err(&dev->pdev->dev,
2370 "HE ep%dn occured - DESPTR = %08lx \n", 2370 "HE ep%dn occurred - DESPTR = %08lx \n",
2371 ep->num, (unsigned long) readl(&ep->regs->desptr)); 2371 ep->num, (unsigned long) readl(&ep->regs->desptr));
2372 2372
2373 /* clear HE */ 2373 /* clear HE */
@@ -2384,7 +2384,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2384 req = list_entry(ep->queue.next, 2384 req = list_entry(ep->queue.next,
2385 struct udc_request, queue); 2385 struct udc_request, queue);
2386 /* 2386 /*
2387 * length bytes transfered 2387 * length bytes transferred
2388 * check dma done of last desc. in PPBDU mode 2388 * check dma done of last desc. in PPBDU mode
2389 */ 2389 */
2390 if (use_dma_ppb_du) { 2390 if (use_dma_ppb_du) {
@@ -2784,7 +2784,7 @@ static irqreturn_t udc_control_in_isr(struct udc *dev)
2784 /* write fifo */ 2784 /* write fifo */
2785 udc_txfifo_write(ep, &req->req); 2785 udc_txfifo_write(ep, &req->req);
2786 2786
2787 /* lengh bytes transfered */ 2787 /* lengh bytes transferred */
2788 len = req->req.length - req->req.actual; 2788 len = req->req.length - req->req.actual;
2789 if (len > ep->ep.maxpacket) 2789 if (len > ep->ep.maxpacket)
2790 len = ep->ep.maxpacket; 2790 len = ep->ep.maxpacket;
diff --git a/drivers/usb/gadget/amd5536udc.h b/drivers/usb/gadget/amd5536udc.h
index 4bbabbbfc93..1d1c7543468 100644
--- a/drivers/usb/gadget/amd5536udc.h
+++ b/drivers/usb/gadget/amd5536udc.h
@@ -584,7 +584,7 @@ union udc_setup_data {
584 * SET and GET bitfields in u32 values 584 * SET and GET bitfields in u32 values
585 * via constants for mask/offset: 585 * via constants for mask/offset:
586 * <bit_field_stub_name> is the text between 586 * <bit_field_stub_name> is the text between
587 * UDC_ and _MASK|_OFS of appropiate 587 * UDC_ and _MASK|_OFS of appropriate
588 * constant 588 * constant
589 * 589 *
590 * set bitfield value in u32 u32Val 590 * set bitfield value in u32 u32Val
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index bb8ddf0469f..9b7cdb16f26 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -826,7 +826,7 @@ done:
826 return status; 826 return status;
827} 827}
828 828
829/* reinit == restore inital software state */ 829/* reinit == restore initial software state */
830static void udc_reinit(struct at91_udc *udc) 830static void udc_reinit(struct at91_udc *udc)
831{ 831{
832 u32 i; 832 u32 i;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index c2251c40a20..82314ed2250 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -42,7 +42,7 @@
42static struct usb_composite_driver *composite; 42static struct usb_composite_driver *composite;
43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev); 43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev);
44 44
45/* Some systems will need runtime overrides for the product identifers 45/* Some systems will need runtime overrides for the product identifiers
46 * published in the device descriptor, either numbers or strings or both. 46 * published in the device descriptor, either numbers or strings or both.
47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters). 47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters).
48 */ 48 */
@@ -205,14 +205,14 @@ int usb_function_activate(struct usb_function *function)
205 * usb_interface_id() is called from usb_function.bind() callbacks to 205 * usb_interface_id() is called from usb_function.bind() callbacks to
206 * allocate new interface IDs. The function driver will then store that 206 * allocate new interface IDs. The function driver will then store that
207 * ID in interface, association, CDC union, and other descriptors. It 207 * ID in interface, association, CDC union, and other descriptors. It
208 * will also handle any control requests targetted at that interface, 208 * will also handle any control requests targeted at that interface,
209 * particularly changing its altsetting via set_alt(). There may 209 * particularly changing its altsetting via set_alt(). There may
210 * also be class-specific or vendor-specific requests to handle. 210 * also be class-specific or vendor-specific requests to handle.
211 * 211 *
212 * All interface identifier should be allocated using this routine, to 212 * All interface identifier should be allocated using this routine, to
213 * ensure that for example different functions don't wrongly assign 213 * ensure that for example different functions don't wrongly assign
214 * different meanings to the same identifier. Note that since interface 214 * different meanings to the same identifier. Note that since interface
215 * identifers are configuration-specific, functions used in more than 215 * identifiers are configuration-specific, functions used in more than
216 * one configuration (or more than once in a given configuration) need 216 * one configuration (or more than once in a given configuration) need
217 * multiple versions of the relevant descriptors. 217 * multiple versions of the relevant descriptors.
218 * 218 *
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 00975ed903d..9abecfddb27 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -742,7 +742,7 @@ int __init control_selector_init(struct f_audio *audio)
742} 742}
743 743
744/** 744/**
745 * audio_bind_config - add USB audio fucntion to a configuration 745 * audio_bind_config - add USB audio function to a configuration
746 * @c: the configuration to supcard the USB audio function 746 * @c: the configuration to supcard the USB audio function
747 * Context: single threaded during gadget setup 747 * Context: single threaded during gadget setup
748 * 748 *
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 130eee678c8..86902a60bcd 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -111,7 +111,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
111#define NTB_OUT_SIZE 16384 111#define NTB_OUT_SIZE 16384
112 112
113/* 113/*
114 * skbs of size less than that will not be alligned 114 * skbs of size less than that will not be aligned
115 * to NCM's dwNtbInMaxSize to save bus bandwidth 115 * to NCM's dwNtbInMaxSize to save bus bandwidth
116 */ 116 */
117 117
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h
index bea5b827beb..e35e24fd64b 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/fsl_qe_udc.h
@@ -208,14 +208,14 @@ struct qe_frame{
208/* Frame status field */ 208/* Frame status field */
209/* Receive side */ 209/* Receive side */
210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */ 210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */
211#define FRAME_ERROR 0x80000000 /* Error occured on frame */ 211#define FRAME_ERROR 0x80000000 /* Error occurred on frame */
212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */ 212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */
213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */ 213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */
214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */ 214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */
215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet 215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet
216 with bit stuff error */ 216 with bit stuff error */
217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */ 217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */
218#define RX_ER_OVERUN 0x02000000 /* Over-run occured on reception */ 218#define RX_ER_OVERUN 0x02000000 /* Over-run occurred on reception */
219#define RX_ER_PID 0x01000000 /* Wrong PID received */ 219#define RX_ER_PID 0x01000000 /* Wrong PID received */
220/* Tranmit side */ 220/* Tranmit side */
221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */ 221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */
@@ -379,7 +379,7 @@ struct qe_udc {
379#define T_LSP 0x01000000 /* Low-speed transaction */ 379#define T_LSP 0x01000000 /* Low-speed transaction */
380#define T_PID 0x00c00000 /* packet id */ 380#define T_PID 0x00c00000 /* packet id */
381#define T_NAK 0x00100000 /* No ack. */ 381#define T_NAK 0x00100000 /* No ack. */
382#define T_STAL 0x00080000 /* Stall recieved */ 382#define T_STAL 0x00080000 /* Stall received */
383#define T_TO 0x00040000 /* time out */ 383#define T_TO 0x00040000 /* time out */
384#define T_UN 0x00020000 /* underrun */ 384#define T_UN 0x00020000 /* underrun */
385 385
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 912cb8e63fe..07499c1cdcc 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -464,7 +464,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
464 464
465 max = le16_to_cpu(desc->wMaxPacketSize); 465 max = le16_to_cpu(desc->wMaxPacketSize);
466 466
467 /* Disable automatic zlp generation. Driver is reponsible to indicate 467 /* Disable automatic zlp generation. Driver is responsible to indicate
468 * explicitly through req->req.zero. This is needed to enable multi-td 468 * explicitly through req->req.zero. This is needed to enable multi-td
469 * request. */ 469 * request. */
470 zlt = 1; 470 zlt = 1;
@@ -648,7 +648,7 @@ static void fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)
648 | EP_QUEUE_HEAD_STATUS_HALT)); 648 | EP_QUEUE_HEAD_STATUS_HALT));
649 dQH->size_ioc_int_sts &= temp; 649 dQH->size_ioc_int_sts &= temp;
650 650
651 /* Ensure that updates to the QH will occure before priming. */ 651 /* Ensure that updates to the QH will occur before priming. */
652 wmb(); 652 wmb();
653 653
654 /* Prime endpoint by writing 1 to ENDPTPRIME */ 654 /* Prime endpoint by writing 1 to ENDPTPRIME */
@@ -1459,7 +1459,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe,
1459 status = -EILSEQ; 1459 status = -EILSEQ;
1460 break; 1460 break;
1461 } else 1461 } else
1462 ERR("Unknown error has occured (0x%x)!\n", 1462 ERR("Unknown error has occurred (0x%x)!\n",
1463 errors); 1463 errors);
1464 1464
1465 } else if (le32_to_cpu(curr_td->size_ioc_sts) 1465 } else if (le32_to_cpu(curr_td->size_ioc_sts)
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 20aeceed48c..e88cce5c2c0 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -15,7 +15,7 @@ struct usb_dr_device {
15 u8 res1[256]; 15 u8 res1[256];
16 u16 caplength; /* Capability Register Length */ 16 u16 caplength; /* Capability Register Length */
17 u16 hciversion; /* Host Controller Interface Version */ 17 u16 hciversion; /* Host Controller Interface Version */
18 u32 hcsparams; /* Host Controller Structual Parameters */ 18 u32 hcsparams; /* Host Controller Structural Parameters */
19 u32 hccparams; /* Host Controller Capability Parameters */ 19 u32 hccparams; /* Host Controller Capability Parameters */
20 u8 res2[20]; 20 u8 res2[20];
21 u32 dciversion; /* Device Controller Interface Version */ 21 u32 dciversion; /* Device Controller Interface Version */
@@ -52,7 +52,7 @@ struct usb_dr_host {
52 u8 res1[256]; 52 u8 res1[256];
53 u16 caplength; /* Capability Register Length */ 53 u16 caplength; /* Capability Register Length */
54 u16 hciversion; /* Host Controller Interface Version */ 54 u16 hciversion; /* Host Controller Interface Version */
55 u32 hcsparams; /* Host Controller Structual Parameters */ 55 u32 hcsparams; /* Host Controller Structural Parameters */
56 u32 hccparams; /* Host Controller Capability Parameters */ 56 u32 hccparams; /* Host Controller Capability Parameters */
57 u8 res2[20]; 57 u8 res2[20];
58 u32 dciversion; /* Device Controller Interface Version */ 58 u32 dciversion; /* Device Controller Interface Version */
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 0ab7e141d49..47b86b99d44 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(index, "Index value for the USB MIDI Gadget adapter.");
67module_param(id, charp, 0444); 67module_param(id, charp, 0444);
68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter."); 68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter.");
69 69
70/* Some systems will want different product identifers published in the 70/* Some systems will want different product identifiers published in the
71 * device descriptor, either numbers or strings or both. These string 71 * device descriptor, either numbers or strings or both. These string
72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
73 */ 73 */
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index 1eca8b47ce3..9cee88a43a7 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -642,7 +642,7 @@ static int queue_dtd(struct langwell_ep *ep, struct langwell_request *req)
642 dqh->dtd_status &= dtd_status; 642 dqh->dtd_status &= dtd_status;
643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status); 643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status);
644 644
645 /* ensure that updates to the dQH will occure before priming */ 645 /* ensure that updates to the dQH will occur before priming */
646 wmb(); 646 wmb();
647 647
648 /* write 1 to endptprime register to PRIME endpoint */ 648 /* write 1 to endptprime register to PRIME endpoint */
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index d5468a7f38e..b62b2640deb 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -325,7 +325,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
325 325
326 /* 326 /*
327 * Ensure that updates to the QH will 327 * Ensure that updates to the QH will
328 * occure before priming. 328 * occur before priming.
329 */ 329 */
330 wmb(); 330 wmb();
331 331
@@ -338,7 +338,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;; 338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
339 dqh->size_ioc_int_sts = 0; 339 dqh->size_ioc_int_sts = 0;
340 340
341 /* Ensure that updates to the QH will occure before priming. */ 341 /* Ensure that updates to the QH will occur before priming. */
342 wmb(); 342 wmb();
343 343
344 /* Prime the Endpoint */ 344 /* Prime the Endpoint */
@@ -1845,7 +1845,7 @@ static irqreturn_t mv_udc_irq(int irq, void *dev)
1845 return IRQ_NONE; 1845 return IRQ_NONE;
1846 } 1846 }
1847 1847
1848 /* Clear all the interrupts occured */ 1848 /* Clear all the interrupts occurred */
1849 writel(status, &udc->op_regs->usbsts); 1849 writel(status, &udc->op_regs->usbsts);
1850 1850
1851 if (status & USBSTS_ERR) 1851 if (status & USBSTS_ERR)
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index d09155b25d7..24696f7fa6a 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -117,7 +117,7 @@ module_param (fifo_mode, ushort, 0644);
117 117
118/* enable_suspend -- When enabled, the driver will respond to 118/* enable_suspend -- When enabled, the driver will respond to
119 * USB suspend requests by powering down the NET2280. Otherwise, 119 * USB suspend requests by powering down the NET2280. Otherwise,
120 * USB suspend requests will be ignored. This is acceptible for 120 * USB suspend requests will be ignored. This is acceptable for
121 * self-powered devices 121 * self-powered devices
122 */ 122 */
123static int enable_suspend = 0; 123static int enable_suspend = 0;
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index b5364f9d7cd..55ca63ad350 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -203,7 +203,7 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
203 goto err_usb; 203 goto err_usb;
204 } 204 }
205 205
206 /* finaly register the configuration */ 206 /* finally register the configuration */
207 status = usb_add_config(cdev, &nokia_config_500ma_driver, 207 status = usb_add_config(cdev, &nokia_config_500ma_driver,
208 nokia_bind_config); 208 nokia_bind_config);
209 if (status < 0) 209 if (status < 0)
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 12ff6cffedc..c3f2bd42bd5 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -126,7 +126,7 @@ static struct printer_dev usb_printer_gadget;
126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */ 126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */
127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */ 127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */
128 128
129/* Some systems will want different product identifers published in the 129/* Some systems will want different product identifiers published in the
130 * device descriptor, either numbers or strings or both. These string 130 * device descriptor, either numbers or strings or both. These string
131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
132 */ 132 */
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 2efd6732d13..78a39a41547 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -602,7 +602,7 @@ static void inc_ep_stats_reqs(struct pxa_ep *ep, int is_in)
602/** 602/**
603 * inc_ep_stats_bytes - Update ep stats counts 603 * inc_ep_stats_bytes - Update ep stats counts
604 * @ep: physical endpoint 604 * @ep: physical endpoint
605 * @count: bytes transfered on endpoint 605 * @count: bytes transferred on endpoint
606 * @is_in: ep direction (USB_DIR_IN or 0) 606 * @is_in: ep direction (USB_DIR_IN or 0)
607 */ 607 */
608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in) 608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in)
@@ -877,7 +877,7 @@ static void nuke(struct pxa_ep *ep, int status)
877 * If there is less space in request than bytes received in OUT endpoint, 877 * If there is less space in request than bytes received in OUT endpoint,
878 * bytes are left in the OUT endpoint. 878 * bytes are left in the OUT endpoint.
879 * 879 *
880 * Returns how many bytes were actually transfered 880 * Returns how many bytes were actually transferred
881 */ 881 */
882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req) 882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
883{ 883{
@@ -914,7 +914,7 @@ static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
914 * endpoint. If there are no bytes to transfer, doesn't write anything 914 * endpoint. If there are no bytes to transfer, doesn't write anything
915 * to physical endpoint. 915 * to physical endpoint.
916 * 916 *
917 * Returns how many bytes were actually transfered. 917 * Returns how many bytes were actually transferred.
918 */ 918 */
919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req, 919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req,
920 unsigned int max) 920 unsigned int max)
@@ -991,7 +991,7 @@ static int read_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
991 * caller guarantees at least one packet buffer is ready (or a zlp). 991 * caller guarantees at least one packet buffer is ready (or a zlp).
992 * Doesn't complete the request, that's the caller's job 992 * Doesn't complete the request, that's the caller's job
993 * 993 *
994 * Returns 1 if request fully transfered, 0 if partial transfer 994 * Returns 1 if request fully transferred, 0 if partial transfer
995 */ 995 */
996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req) 996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
997{ 997{
@@ -1094,7 +1094,7 @@ static int read_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in). 1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in).
1095 * If the request doesn't fit, the remaining part will be sent from irq. 1095 * If the request doesn't fit, the remaining part will be sent from irq.
1096 * The request is considered fully written only if either : 1096 * The request is considered fully written only if either :
1097 * - last write transfered all remaining bytes, but fifo was not fully filled 1097 * - last write transferred all remaining bytes, but fifo was not fully filled
1098 * - last write was a 0 length write 1098 * - last write was a 0 length write
1099 * 1099 *
1100 * Returns 1 if request fully written, 0 if request only partially sent 1100 * Returns 1 if request fully written, 0 if request only partially sent
@@ -1548,7 +1548,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget)
1548 * pxa_udc_wakeup - Force udc device out of suspend 1548 * pxa_udc_wakeup - Force udc device out of suspend
1549 * @_gadget: usb gadget 1549 * @_gadget: usb gadget
1550 * 1550 *
1551 * Returns 0 if successfull, error code otherwise 1551 * Returns 0 if successful, error code otherwise
1552 */ 1552 */
1553static int pxa_udc_wakeup(struct usb_gadget *_gadget) 1553static int pxa_udc_wakeup(struct usb_gadget *_gadget)
1554{ 1554{
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index ef825c3baed..0912679de99 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -41,8 +41,8 @@
41/* EP0_MPS_LIMIT 41/* EP0_MPS_LIMIT
42 * 42 *
43 * Unfortunately there seems to be a limit of the amount of data that can 43 * Unfortunately there seems to be a limit of the amount of data that can
44 * be transfered by IN transactions on EP0. This is either 127 bytes or 3 44 * be transferred by IN transactions on EP0. This is either 127 bytes or 3
45 * packets (which practially means 1 packet and 63 bytes of data) when the 45 * packets (which practically means 1 packet and 63 bytes of data) when the
46 * MPS is set to 64. 46 * MPS is set to 64.
47 * 47 *
48 * This means if we are wanting to move >127 bytes of data, we need to 48 * This means if we are wanting to move >127 bytes of data, we need to
@@ -783,7 +783,7 @@ static void s3c_hsotg_start_req(struct s3c_hsotg *hsotg,
783 hsotg->regs + S3C_DIEPINT(index)); 783 hsotg->regs + S3C_DIEPINT(index));
784 784
785 /* Note, trying to clear the NAK here causes problems with transmit 785 /* Note, trying to clear the NAK here causes problems with transmit
786 * on the S3C6400 ending up with the TXFIFO becomming full. */ 786 * on the S3C6400 ending up with the TXFIFO becoming full. */
787 787
788 /* check ep is enabled */ 788 /* check ep is enabled */
789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna)) 789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna))
@@ -1176,10 +1176,10 @@ static void s3c_hsotg_process_control(struct s3c_hsotg *hsotg,
1176 writel(ctrl, hsotg->regs + reg); 1176 writel(ctrl, hsotg->regs + reg);
1177 1177
1178 dev_dbg(hsotg->dev, 1178 dev_dbg(hsotg->dev,
1179 "writen DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n", 1179 "written DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n",
1180 ctrl, reg, readl(hsotg->regs + reg)); 1180 ctrl, reg, readl(hsotg->regs + reg));
1181 1181
1182 /* don't belive we need to anything more to get the EP 1182 /* don't believe we need to anything more to get the EP
1183 * to reply with a STALL packet */ 1183 * to reply with a STALL packet */
1184 } 1184 }
1185} 1185}
@@ -1416,7 +1416,7 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
1416 * transaction. 1416 * transaction.
1417 * 1417 *
1418 * Note, since we don't write any data to the TxFIFO, then it is 1418 * Note, since we don't write any data to the TxFIFO, then it is
1419 * currently belived that we do not need to wait for any space in 1419 * currently believed that we do not need to wait for any space in
1420 * the TxFIFO. 1420 * the TxFIFO.
1421 */ 1421 */
1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg, 1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg,
@@ -1540,7 +1540,7 @@ static u32 s3c_hsotg_read_frameno(struct s3c_hsotg *hsotg)
1540 * that requires processing, so find out what is in there and do the 1540 * that requires processing, so find out what is in there and do the
1541 * appropriate read. 1541 * appropriate read.
1542 * 1542 *
1543 * The RXFIFO is a true FIFO, the packets comming out are still in packet 1543 * The RXFIFO is a true FIFO, the packets coming out are still in packet
1544 * chunks, so if you have x packets received on an endpoint you'll get x 1544 * chunks, so if you have x packets received on an endpoint you'll get x
1545 * FIFO events delivered, each with a packet's worth of data in it. 1545 * FIFO events delivered, each with a packet's worth of data in it.
1546 * 1546 *
@@ -2188,7 +2188,7 @@ irq_retry:
2188 2188
2189 /* these next two seem to crop-up occasionally causing the core 2189 /* these next two seem to crop-up occasionally causing the core
2190 * to shutdown the USB transfer, so try clearing them and logging 2190 * to shutdown the USB transfer, so try clearing them and logging
2191 * the occurence. */ 2191 * the occurrence. */
2192 2192
2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) { 2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) {
2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n"); 2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n");
@@ -2469,7 +2469,7 @@ static struct usb_ep_ops s3c_hsotg_ep_ops = {
2469 .queue = s3c_hsotg_ep_queue, 2469 .queue = s3c_hsotg_ep_queue,
2470 .dequeue = s3c_hsotg_ep_dequeue, 2470 .dequeue = s3c_hsotg_ep_dequeue,
2471 .set_halt = s3c_hsotg_ep_sethalt, 2471 .set_halt = s3c_hsotg_ep_sethalt,
2472 /* note, don't belive we have any call for the fifo routines */ 2472 /* note, don't believe we have any call for the fifo routines */
2473}; 2473};
2474 2474
2475/** 2475/**
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 9483acdf2e9..e0e0787b724 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -402,7 +402,7 @@ config FHCI_DEBUG
402 depends on USB_FHCI_HCD && DEBUG_FS 402 depends on USB_FHCI_HCD && DEBUG_FS
403 help 403 help
404 Say "y" to see some FHCI debug information and statistics 404 Say "y" to see some FHCI debug information and statistics
405 throught debugfs. 405 through debugfs.
406 406
407config USB_U132_HCD 407config USB_U132_HCD
408 tristate "Elan U132 Adapter Host Controller" 408 tristate "Elan U132 Adapter Host Controller"
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index f86d3fa2021..333ddc15691 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -644,7 +644,7 @@ static inline void ehci_writel(const struct ehci_hcd *ehci,
644/* 644/*
645 * On certain ppc-44x SoC there is a HW issue, that could only worked around with 645 * On certain ppc-44x SoC there is a HW issue, that could only worked around with
646 * explicit suspend/operate of OHCI. This function hereby makes sense only on that arch. 646 * explicit suspend/operate of OHCI. This function hereby makes sense only on that arch.
647 * Other common bits are dependant on has_amcc_usb23 quirk flag. 647 * Other common bits are dependent on has_amcc_usb23 quirk flag.
648 */ 648 */
649#ifdef CONFIG_44x 649#ifdef CONFIG_44x
650static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational) 650static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational)
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index b84ff7e5189..19223c7449e 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -401,7 +401,7 @@ static int fhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
401 /* 1 td fro setup,1 for ack */ 401 /* 1 td fro setup,1 for ack */
402 size = 2; 402 size = 2;
403 case PIPE_BULK: 403 case PIPE_BULK:
404 /* one td for every 4096 bytes(can be upto 8k) */ 404 /* one td for every 4096 bytes(can be up to 8k) */
405 size += urb->transfer_buffer_length / 4096; 405 size += urb->transfer_buffer_length / 4096;
406 /* ...add for any remaining bytes... */ 406 /* ...add for any remaining bytes... */
407 if ((urb->transfer_buffer_length % 4096) != 0) 407 if ((urb->transfer_buffer_length % 4096) != 0)
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 38fe058fbe6..0ea577bfca2 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -40,7 +40,7 @@
40#define TD_RXER 0x0020 /* Rx error or not */ 40#define TD_RXER 0x0020 /* Rx error or not */
41 41
42#define TD_NAK 0x0010 /* No ack. */ 42#define TD_NAK 0x0010 /* No ack. */
43#define TD_STAL 0x0008 /* Stall recieved */ 43#define TD_STAL 0x0008 /* Stall received */
44#define TD_TO 0x0004 /* time out */ 44#define TD_TO 0x0004 /* time out */
45#define TD_UN 0x0002 /* underrun */ 45#define TD_UN 0x0002 /* underrun */
46#define TD_NO 0x0010 /* Rx Non Octet Aligned Packet */ 46#define TD_NO 0x0010 /* Rx Non Octet Aligned Packet */
@@ -274,7 +274,7 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep,
274 * It is also preparing the TDs for new frames. If the Tx interrupts 274 * It is also preparing the TDs for new frames. If the Tx interrupts
275 * are disabled, the application should call that routine to get 275 * are disabled, the application should call that routine to get
276 * confirmation about the submitted frames. Otherwise, the routine is 276 * confirmation about the submitted frames. Otherwise, the routine is
277 * called frome the interrupt service routine during the Tx interrupt. 277 * called from the interrupt service routine during the Tx interrupt.
278 * In that case the application is informed by calling the application 278 * In that case the application is informed by calling the application
279 * specific 'fhci_transaction_confirm' routine 279 * specific 'fhci_transaction_confirm' routine
280 */ 280 */
@@ -337,7 +337,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
337 pkt->status = USB_TD_RX_ER_NONOCT; 337 pkt->status = USB_TD_RX_ER_NONOCT;
338 else 338 else
339 fhci_err(usb->fhci, "illegal error " 339 fhci_err(usb->fhci, "illegal error "
340 "occured\n"); 340 "occurred\n");
341 } else if (td_status & TD_NAK) 341 } else if (td_status & TD_NAK)
342 pkt->status = USB_TD_TX_ER_NAK; 342 pkt->status = USB_TD_TX_ER_NAK;
343 else if (td_status & TD_TO) 343 else if (td_status & TD_TO)
@@ -347,7 +347,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
347 else if (td_status & TD_STAL) 347 else if (td_status & TD_STAL)
348 pkt->status = USB_TD_TX_ER_STALL; 348 pkt->status = USB_TD_TX_ER_STALL;
349 else 349 else
350 fhci_err(usb->fhci, "illegal error occured\n"); 350 fhci_err(usb->fhci, "illegal error occurred\n");
351 } else if ((extra_data & TD_TOK_IN) && 351 } else if ((extra_data & TD_TOK_IN) &&
352 pkt->len > td_length - CRC_SIZE) { 352 pkt->len > td_length - CRC_SIZE) {
353 pkt->status = USB_TD_RX_DATA_UNDERUN; 353 pkt->status = USB_TD_RX_DATA_UNDERUN;
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 71c3caaea4c..dc6939a44a1 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -82,7 +82,7 @@
82#define USB_TD_RX_ER_NONOCT 0x40000000 /* Tx Non Octet Aligned Packet */ 82#define USB_TD_RX_ER_NONOCT 0x40000000 /* Tx Non Octet Aligned Packet */
83#define USB_TD_RX_ER_BITSTUFF 0x20000000 /* Frame Aborted-Received pkt */ 83#define USB_TD_RX_ER_BITSTUFF 0x20000000 /* Frame Aborted-Received pkt */
84#define USB_TD_RX_ER_CRC 0x10000000 /* CRC error */ 84#define USB_TD_RX_ER_CRC 0x10000000 /* CRC error */
85#define USB_TD_RX_ER_OVERUN 0x08000000 /* Over - run occured */ 85#define USB_TD_RX_ER_OVERUN 0x08000000 /* Over - run occurred */
86#define USB_TD_RX_ER_PID 0x04000000 /* wrong PID received */ 86#define USB_TD_RX_ER_PID 0x04000000 /* wrong PID received */
87#define USB_TD_RX_DATA_UNDERUN 0x02000000 /* shorter than expected */ 87#define USB_TD_RX_DATA_UNDERUN 0x02000000 /* shorter than expected */
88#define USB_TD_RX_DATA_OVERUN 0x01000000 /* longer than expected */ 88#define USB_TD_RX_DATA_OVERUN 0x01000000 /* longer than expected */
@@ -363,7 +363,7 @@ struct ed {
363struct td { 363struct td {
364 void *data; /* a pointer to the data buffer */ 364 void *data; /* a pointer to the data buffer */
365 unsigned int len; /* length of the data to be submitted */ 365 unsigned int len; /* length of the data to be submitted */
366 unsigned int actual_len; /* actual bytes transfered on this td */ 366 unsigned int actual_len; /* actual bytes transferred on this td */
367 enum fhci_ta_type type; /* transaction type */ 367 enum fhci_ta_type type; /* transaction type */
368 u8 toggle; /* toggle for next trans. within this TD */ 368 u8 toggle; /* toggle for next trans. within this TD */
369 u16 iso_index; /* ISO transaction index */ 369 u16 iso_index; /* ISO transaction index */
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 2562e92e317..af05718bdc7 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1323,7 +1323,7 @@ static void process_etds(struct usb_hcd *hcd, struct imx21 *imx21, int sof)
1323 * (and hence no interrupt occurs). 1323 * (and hence no interrupt occurs).
1324 * This causes the transfer in question to hang. 1324 * This causes the transfer in question to hang.
1325 * The kludge below checks for this condition at each SOF and processes any 1325 * The kludge below checks for this condition at each SOF and processes any
1326 * blocked ETDs (after an arbitary 10 frame wait) 1326 * blocked ETDs (after an arbitrary 10 frame wait)
1327 * 1327 *
1328 * With a single active transfer the usbtest test suite will run for days 1328 * With a single active transfer the usbtest test suite will run for days
1329 * without the kludge. 1329 * without the kludge.
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index 12db961acdf..9a2c400e609 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -13,7 +13,7 @@
13 13
14/* Full speed: max # of bytes to transfer for a single urb 14/* Full speed: max # of bytes to transfer for a single urb
15 at a time must be < 1024 && must be multiple of 64. 15 at a time must be < 1024 && must be multiple of 64.
16 832 allows transfering 4kiB within 5 frames. */ 16 832 allows transferring 4kiB within 5 frames. */
17#define MAX_TRANSFER_SIZE_FULLSPEED 832 17#define MAX_TRANSFER_SIZE_FULLSPEED 832
18 18
19/* Low speed: there is no reason to schedule in very big 19/* Low speed: there is no reason to schedule in very big
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 662cd002adf..f97570a847c 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -546,7 +546,7 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
546 if (usb_pipecontrol(urb->pipe)) { 546 if (usb_pipecontrol(urb->pipe)) {
547 ep->nextpid = USB_PID_ACK; 547 ep->nextpid = USB_PID_ACK;
548 /* save the data underrun error code for later and 548 /* save the data underrun error code for later and
549 * procede with the status stage 549 * proceed with the status stage
550 */ 550 */
551 urb->actual_length += PTD_GET_COUNT(ptd); 551 urb->actual_length += PTD_GET_COUNT(ptd);
552 BUG_ON(urb->actual_length > urb->transfer_buffer_length); 552 BUG_ON(urb->actual_length > urb->transfer_buffer_length);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index e7288639edb..d5572351486 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -162,7 +162,7 @@ static int ohci_urb_enqueue (
162 // case PIPE_INTERRUPT: 162 // case PIPE_INTERRUPT:
163 // case PIPE_BULK: 163 // case PIPE_BULK:
164 default: 164 default:
165 /* one TD for every 4096 Bytes (can be upto 8K) */ 165 /* one TD for every 4096 Bytes (can be up to 8K) */
166 size += urb->transfer_buffer_length / 4096; 166 size += urb->transfer_buffer_length / 4096;
167 /* ... and for any remaining bytes ... */ 167 /* ... and for any remaining bytes ... */
168 if ((urb->transfer_buffer_length % 4096) != 0) 168 if ((urb->transfer_buffer_length % 4096) != 0)
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 44e4deb362e..4a771f6cc82 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -2879,7 +2879,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
2879 /* Ok, we have more job to do! :) */ 2879 /* Ok, we have more job to do! :) */
2880 2880
2881 for (i = 0; i < num - 1; i++) { 2881 for (i = 0; i < num - 1; i++) {
2882 /* Get free micro URB poll till a free urb is recieved */ 2882 /* Get free micro URB poll till a free urb is received */
2883 2883
2884 do { 2884 do {
2885 murb = (struct urb *) oxu_murb_alloc(oxu); 2885 murb = (struct urb *) oxu_murb_alloc(oxu);
@@ -2911,7 +2911,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
2911 2911
2912 /* Last urb requires special handling */ 2912 /* Last urb requires special handling */
2913 2913
2914 /* Get free micro URB poll till a free urb is recieved */ 2914 /* Get free micro URB poll till a free urb is received */
2915 do { 2915 do {
2916 murb = (struct urb *) oxu_murb_alloc(oxu); 2916 murb = (struct urb *) oxu_murb_alloc(oxu);
2917 if (!murb) 2917 if (!murb)
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index dc0ab8382f5..d6e17542861 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -739,7 +739,7 @@ static int get_urb_status_from_qtd(struct urb *urb, u32 status)
739 * process_inactive_qtd - process an inactive (but not halted) qTD. 739 * process_inactive_qtd - process an inactive (but not halted) qTD.
740 * 740 *
741 * Update the urb with the transfer bytes from the qTD, if the urb is 741 * Update the urb with the transfer bytes from the qTD, if the urb is
742 * completely transfered or (in the case of an IN only) the LPF is 742 * completely transferred or (in the case of an IN only) the LPF is
743 * set, then the transfer is complete and the urb should be returned 743 * set, then the transfer is complete and the urb should be returned
744 * to the system. 744 * to the system.
745 */ 745 */
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 9a3645fd759..196e0181b2e 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -741,7 +741,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
741 int retval; 741 int retval;
742 742
743 /* Wait a bit if either of the roothubs need to settle from the 743 /* Wait a bit if either of the roothubs need to settle from the
744 * transistion into bus suspend. 744 * transition into bus suspend.
745 */ 745 */
746 if (time_before(jiffies, xhci->bus_state[0].next_statechange) || 746 if (time_before(jiffies, xhci->bus_state[0].next_statechange) ||
747 time_before(jiffies, 747 time_before(jiffies,
@@ -2072,7 +2072,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
2072 return -EINVAL; 2072 return -EINVAL;
2073 } 2073 }
2074 vdev = xhci->devs[udev->slot_id]; 2074 vdev = xhci->devs[udev->slot_id];
2075 /* Mark each endpoint as being in transistion, so 2075 /* Mark each endpoint as being in transition, so
2076 * xhci_urb_enqueue() will reject all URBs. 2076 * xhci_urb_enqueue() will reject all URBs.
2077 */ 2077 */
2078 for (i = 0; i < num_eps; i++) { 2078 for (i = 0; i < num_eps; i++) {
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 711de253bc0..07e263063e3 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -873,7 +873,7 @@ struct xhci_transfer_event {
873#define COMP_CMD_ABORT 25 873#define COMP_CMD_ABORT 25
874/* Stopped - transfer was terminated by a stop endpoint command */ 874/* Stopped - transfer was terminated by a stop endpoint command */
875#define COMP_STOP 26 875#define COMP_STOP 26
876/* Same as COMP_EP_STOPPED, but the transfered length in the event is invalid */ 876/* Same as COMP_EP_STOPPED, but the transferred length in the event is invalid */
877#define COMP_STOP_INVAL 27 877#define COMP_STOP_INVAL 27
878/* Control Abort Error - Debug Capability - control pipe aborted */ 878/* Control Abort Error - Debug Capability - control pipe aborted */
879#define COMP_DBG_ABORT 28 879#define COMP_DBG_ABORT 28
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c90c89dc000..a0037961e5b 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -69,7 +69,7 @@
69 * 20000513 added IDs for all products supported by Windows driver (john) 69 * 20000513 added IDs for all products supported by Windows driver (john)
70 * 20000514 Rewrote mts_scsi_queuecommand to use URBs (john) 70 * 20000514 Rewrote mts_scsi_queuecommand to use URBs (john)
71 * 20000514 Version 0.0.8j 71 * 20000514 Version 0.0.8j
72 * 20000514 Fix reporting of non-existant devices to SCSI layer (john) 72 * 20000514 Fix reporting of non-existent devices to SCSI layer (john)
73 * 20000514 Added MTS_DEBUG_INT (john) 73 * 20000514 Added MTS_DEBUG_INT (john)
74 * 20000514 Changed "usb-microtek" to "microtek" for consistency (john) 74 * 20000514 Changed "usb-microtek" to "microtek" for consistency (john)
75 * 20000514 Stupid bug fixes (john) 75 * 20000514 Stupid bug fixes (john)
@@ -557,14 +557,14 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
557 557
558 if ( !memcmp( srb->cmnd, mts_read_image_sig, mts_read_image_sig_len ) 558 if ( !memcmp( srb->cmnd, mts_read_image_sig, mts_read_image_sig_len )
559) { pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_image); 559) { pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_image);
560 MTS_DEBUG( "transfering from desc->ep_image == %d\n", 560 MTS_DEBUG( "transferring from desc->ep_image == %d\n",
561 (int)desc->ep_image ); 561 (int)desc->ep_image );
562 } else if ( MTS_DIRECTION_IS_IN(srb->cmnd[0]) ) { 562 } else if ( MTS_DIRECTION_IS_IN(srb->cmnd[0]) ) {
563 pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_response); 563 pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_response);
564 MTS_DEBUG( "transfering from desc->ep_response == %d\n", 564 MTS_DEBUG( "transferring from desc->ep_response == %d\n",
565 (int)desc->ep_response); 565 (int)desc->ep_response);
566 } else { 566 } else {
567 MTS_DEBUG("transfering to desc->ep_out == %d\n", 567 MTS_DEBUG("transferring to desc->ep_out == %d\n",
568 (int)desc->ep_out); 568 (int)desc->ep_out);
569 pipe = usb_sndbulkpipe(desc->usb_dev,desc->ep_out); 569 pipe = usb_sndbulkpipe(desc->usb_dev,desc->ep_out);
570 } 570 }
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index e573e470401..a2190b983f5 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -40,7 +40,7 @@
40#ifdef CONFIG_USB_DYNAMIC_MINORS 40#ifdef CONFIG_USB_DYNAMIC_MINORS
41#define IOWARRIOR_MINOR_BASE 0 41#define IOWARRIOR_MINOR_BASE 0
42#else 42#else
43#define IOWARRIOR_MINOR_BASE 208 // SKELETON_MINOR_BASE 192 + 16, not offical yet 43#define IOWARRIOR_MINOR_BASE 208 // SKELETON_MINOR_BASE 192 + 16, not official yet
44#endif 44#endif
45 45
46/* interrupt input queue size */ 46/* interrupt input queue size */
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 8c6fdef61d1..e25700f44b6 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -1531,7 +1531,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
1531 i2c_set_clientdata(i2c, isp); 1531 i2c_set_clientdata(i2c, isp);
1532 isp->client = i2c; 1532 isp->client = i2c;
1533 1533
1534 /* verify the chip (shouldn't be necesary) */ 1534 /* verify the chip (shouldn't be necessary) */
1535 status = isp1301_get_u16(isp, ISP1301_VENDOR_ID); 1535 status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
1536 if (status != I2C_VENDOR_ID_PHILIPS) { 1536 if (status != I2C_VENDOR_ID_PHILIPS) {
1537 dev_dbg(&i2c->dev, "not philips id: %d\n", status); 1537 dev_dbg(&i2c->dev, "not philips id: %d\n", status);
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
index 7f9b8cd4514..e973ff19c55 100644
--- a/drivers/usb/otg/langwell_otg.c
+++ b/drivers/usb/otg/langwell_otg.c
@@ -580,7 +580,7 @@ static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers)
580 time = TB_BUS_SUSPEND; 580 time = TB_BUS_SUSPEND;
581 break; 581 break;
582 default: 582 default:
583 dev_dbg(lnw->dev, "unkown timer, cannot enable it\n"); 583 dev_dbg(lnw->dev, "unknown timer, cannot enable it\n");
584 return; 584 return;
585 } 585 }
586 586
@@ -1381,7 +1381,7 @@ static void langwell_otg_work(struct work_struct *work)
1381 } else if (!iotg->hsm.a_bus_req && iotg->otg.host && 1381 } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
1382 iotg->otg.host->b_hnp_enable) { 1382 iotg->otg.host->b_hnp_enable) {
1383 /* It is not safe enough to do a fast 1383 /* It is not safe enough to do a fast
1384 * transistion from A_WAIT_BCON to 1384 * transition from A_WAIT_BCON to
1385 * A_SUSPEND */ 1385 * A_SUSPEND */
1386 msleep(10000); 1386 msleep(10000);
1387 if (iotg->hsm.a_bus_req) 1387 if (iotg->hsm.a_bus_req)
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 0db6ace16f7..aba201cb872 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -16,7 +16,7 @@
16 * When reading the process is almost equal except that the header starts with 16 * When reading the process is almost equal except that the header starts with
17 * 0x00 0x20. 17 * 0x00 0x20.
18 * 18 *
19 * The device simply need some stuff to understand data comming from the usb 19 * The device simply need some stuff to understand data coming from the usb
20 * buffer: The First and Second byte is used for a Header, the Third and Fourth 20 * buffer: The First and Second byte is used for a Header, the Third and Fourth
21 * tells the device the amount of information the package holds. 21 * tells the device the amount of information the package holds.
22 * Packages are 60 bytes long Header Stuff. 22 * Packages are 60 bytes long Header Stuff.
@@ -30,7 +30,7 @@
30 * one. 30 * one.
31 * 31 *
32 * The driver registers himself with the USB-serial core and the USB Core. I had 32 * The driver registers himself with the USB-serial core and the USB Core. I had
33 * to implement a probe function agains USB-serial, because other way, the 33 * to implement a probe function against USB-serial, because other way, the
34 * driver was attaching himself to both interfaces. I have tryed with different 34 * driver was attaching himself to both interfaces. I have tryed with different
35 * configurations of usb_serial_driver with out exit, only the probe function 35 * configurations of usb_serial_driver with out exit, only the probe function
36 * could handle this correctly. 36 * could handle this correctly.
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 4df3e0cecba..0f11afdda13 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -101,7 +101,7 @@ static const struct usb_device_id id_table[] = {
101 { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */ 101 { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */
102 { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ 102 { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
103 { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ 103 { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */
104 { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demostration module */ 104 { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
105 { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesys ETRX2USB */ 105 { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesys ETRX2USB */
106 { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ 106 { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
107 { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ 107 { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 987e9bf7bd0..d9906eb9d16 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -35,7 +35,7 @@
35 * 35 *
36 * Lonnie Mendez <dignome@gmail.com> 36 * Lonnie Mendez <dignome@gmail.com>
37 * 04-10-2004 37 * 04-10-2004
38 * Driver modified to support dynamic line settings. Various improvments 38 * Driver modified to support dynamic line settings. Various improvements
39 * and features. 39 * and features.
40 * 40 *
41 * Neil Whelchel 41 * Neil Whelchel
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 65967b36365..a973c7a29d6 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -17,7 +17,7 @@
17 * See Documentation/usb/usb-serial.txt for more information on using this 17 * See Documentation/usb/usb-serial.txt for more information on using this
18 * driver 18 * driver
19 * 19 *
20 * See http://ftdi-usb-sio.sourceforge.net for upto date testing info 20 * See http://ftdi-usb-sio.sourceforge.net for up to date testing info
21 * and extra documentation 21 * and extra documentation
22 * 22 *
23 * Change entries from 2004 and earlier can be found in versions of this 23 * Change entries from 2004 and earlier can be found in versions of this
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index f1aedfa7c42..abf095be575 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1981,7 +1981,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
1981 if (code == IOSP_STATUS_OPEN_RSP) { 1981 if (code == IOSP_STATUS_OPEN_RSP) {
1982 edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3); 1982 edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3);
1983 edge_port->maxTxCredits = edge_port->txCredits; 1983 edge_port->maxTxCredits = edge_port->txCredits;
1984 dbg("%s - Port %u Open Response Inital MSR = %02x TxBufferSize = %d", __func__, edge_serial->rxPort, byte2, edge_port->txCredits); 1984 dbg("%s - Port %u Open Response Initial MSR = %02x TxBufferSize = %d", __func__, edge_serial->rxPort, byte2, edge_port->txCredits);
1985 handle_new_msr(edge_port, byte2); 1985 handle_new_msr(edge_port, byte2);
1986 1986
1987 /* send the current line settings to the port so we are 1987 /* send the current line settings to the port so we are
diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index dced7ec6547..ad9c1d47a61 100644
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -68,7 +68,7 @@ struct comMapper {
68#define PROC_SET_COM_ENTRY 2 68#define PROC_SET_COM_ENTRY 2
69 69
70 70
71/* The following sturcture is passed to the write */ 71/* The following structure is passed to the write */
72struct procWrite { 72struct procWrite {
73 int Command; 73 int Command;
74 union { 74 union {
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index d8434910fa7..0aac00afb5c 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -433,7 +433,7 @@ static int write_i2c_mem(struct edgeport_serial *serial,
433 433
434 /* We can only send a maximum of 1 aligned byte page at a time */ 434 /* We can only send a maximum of 1 aligned byte page at a time */
435 435
436 /* calulate the number of bytes left in the first page */ 436 /* calculate the number of bytes left in the first page */
437 write_length = EPROM_PAGE_SIZE - 437 write_length = EPROM_PAGE_SIZE -
438 (start_address & (EPROM_PAGE_SIZE - 1)); 438 (start_address & (EPROM_PAGE_SIZE - 1));
439 439
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 201f6096844..a6f63cc8c13 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -116,7 +116,7 @@ static void opticon_read_bulk_callback(struct urb *urb)
116 } else { 116 } else {
117 if ((data[0] == 0x00) && (data[1] == 0x01)) { 117 if ((data[0] == 0x00) && (data[1] == 0x01)) {
118 spin_lock_irqsave(&priv->lock, flags); 118 spin_lock_irqsave(&priv->lock, flags);
119 /* CTS status infomation package */ 119 /* CTS status information package */
120 if (data[2] == 0x00) 120 if (data[2] == 0x00)
121 priv->cts = false; 121 priv->cts = false;
122 else 122 else
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 08e03745e25..0e5aafda453 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -562,7 +562,7 @@ static int ene_sd_init(struct us_data *us)
562 562
563 result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0); 563 result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0);
564 if (result != USB_STOR_XFER_GOOD) { 564 if (result != USB_STOR_XFER_GOOD) {
565 US_DEBUGP("Exection SD Init Code Fail !!\n"); 565 US_DEBUGP("Execution SD Init Code Fail !!\n");
566 return USB_STOR_TRANSPORT_ERROR; 566 return USB_STOR_TRANSPORT_ERROR;
567 } 567 }
568 568
@@ -581,7 +581,7 @@ static int ene_sd_init(struct us_data *us)
581 581
582 result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0); 582 result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0);
583 if (result != USB_STOR_XFER_GOOD) { 583 if (result != USB_STOR_XFER_GOOD) {
584 US_DEBUGP("Exection SD Init Code Fail !!\n"); 584 US_DEBUGP("Execution SD Init Code Fail !!\n");
585 return USB_STOR_TRANSPORT_ERROR; 585 return USB_STOR_TRANSPORT_ERROR;
586 } 586 }
587 587
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6b9982cd542..09e52ba47dd 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1510,7 +1510,7 @@ static int isd200_Initialization(struct us_data *us)
1510 * Protocol and Transport for the ISD200 ASIC 1510 * Protocol and Transport for the ISD200 ASIC
1511 * 1511 *
1512 * This protocol and transport are for ATA devices connected to an ISD200 1512 * This protocol and transport are for ATA devices connected to an ISD200
1513 * ASIC. An ATAPI device that is conected as a slave device will be 1513 * ASIC. An ATAPI device that is connected as a slave device will be
1514 * detected in the driver initialization function and the protocol will 1514 * detected in the driver initialization function and the protocol will
1515 * be changed to an ATAPI protocol (Transparent SCSI). 1515 * be changed to an ATAPI protocol (Transparent SCSI).
1516 * 1516 *
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 689ee1fb702..13b8bcdf3db 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -123,7 +123,7 @@ static int slave_configure(struct scsi_device *sdev)
123{ 123{
124 struct us_data *us = host_to_us(sdev->host); 124 struct us_data *us = host_to_us(sdev->host);
125 125
126 /* Many devices have trouble transfering more than 32KB at a time, 126 /* Many devices have trouble transferring more than 32KB at a time,
127 * while others have trouble with more than 64K. At this time we 127 * while others have trouble with more than 64K. At this time we
128 * are limiting both to 32K (64 sectores). 128 * are limiting both to 32K (64 sectores).
129 */ 129 */
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index bd3f415893d..0b00091d2ae 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -340,7 +340,7 @@ static int usbat_check_status(struct us_data *us)
340} 340}
341 341
342/* 342/*
343 * Stores critical information in internal registers in prepartion for the execution 343 * Stores critical information in internal registers in preparation for the execution
344 * of a conditional usbat_read_blocks or usbat_write_blocks call. 344 * of a conditional usbat_read_blocks or usbat_write_blocks call.
345 */ 345 */
346static int usbat_set_shuttle_features(struct us_data *us, 346static int usbat_set_shuttle_features(struct us_data *us,
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 827c87f10cc..7e4bf95f8f7 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -180,7 +180,7 @@ static void bytewise_xor(void *_bo, const void *_bi1, const void *_bi2,
180 * using the 14 bytes of @a to fill up 180 * using the 14 bytes of @a to fill up
181 * b1.{mac_header,e0,security_reserved,padding}. 181 * b1.{mac_header,e0,security_reserved,padding}.
182 * 182 *
183 * NOTE: The definiton of l(a) in WUSB1.0[6.5] vs the definition of 183 * NOTE: The definition of l(a) in WUSB1.0[6.5] vs the definition of
184 * l(m) is orthogonal, they bear no relationship, so it is not 184 * l(m) is orthogonal, they bear no relationship, so it is not
185 * in conflict with the parameter's relation that 185 * in conflict with the parameter's relation that
186 * WUSB1.0[6.4.2]) defines. 186 * WUSB1.0[6.4.2]) defines.
@@ -272,7 +272,7 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
272 272
273 /* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5] 273 /* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5]
274 * The procedure is to AES crypt the A0 block and XOR the MIC 274 * The procedure is to AES crypt the A0 block and XOR the MIC
275 * Tag agains it; we only do the first 8 bytes and place it 275 * Tag against it; we only do the first 8 bytes and place it
276 * directly in the destination buffer. 276 * directly in the destination buffer.
277 * 277 *
278 * POS Crypto API: size is assumed to be AES's block size. 278 * POS Crypto API: size is assumed to be AES's block size.
diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index 4ed97360c04..6f4fafdc240 100644
--- a/drivers/usb/wusbcore/reservation.c
+++ b/drivers/usb/wusbcore/reservation.c
@@ -71,7 +71,7 @@ static void wusbhc_rsv_complete_cb(struct uwb_rsv *rsv)
71 71
72/** 72/**
73 * wusbhc_rsv_establish - establish a reservation for the cluster 73 * wusbhc_rsv_establish - establish a reservation for the cluster
74 * @wusbhc: the WUSB HC requesting a bandwith reservation 74 * @wusbhc: the WUSB HC requesting a bandwidth reservation
75 */ 75 */
76int wusbhc_rsv_establish(struct wusbhc *wusbhc) 76int wusbhc_rsv_establish(struct wusbhc *wusbhc)
77{ 77{
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index c175b7300c7..39de3900ad2 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -133,7 +133,7 @@ static int wusbhc_rh_port_reset(struct wusbhc *wusbhc, u8 port_idx)
133 * big of a problem [and we can't make it an spinlock 133 * big of a problem [and we can't make it an spinlock
134 * because other parts need to take it and sleep] . 134 * because other parts need to take it and sleep] .
135 * 135 *
136 * @usb_hcd is refcounted, so it won't dissapear under us 136 * @usb_hcd is refcounted, so it won't disappear under us
137 * and before killing a host, the polling of the root hub 137 * and before killing a host, the polling of the root hub
138 * would be stopped anyway. 138 * would be stopped anyway.
139 */ 139 */
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index 8cb9d80207f..ca80171f42c 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -24,7 +24,7 @@
24 * 24 *
25 * RPIPE 25 * RPIPE
26 * 26 *
27 * Targetted at different downstream endpoints 27 * Targeted at different downstream endpoints
28 * 28 *
29 * Descriptor: use to config the remote pipe. 29 * Descriptor: use to config the remote pipe.
30 * 30 *
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 84b744c428a..6ccd93a9b90 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -61,7 +61,7 @@
61 * 61 *
62 * Two methods it could be done: 62 * Two methods it could be done:
63 * 63 *
64 * (a) set up a timer everytime an rpipe's use count drops to 1 64 * (a) set up a timer every time an rpipe's use count drops to 1
65 * (which means unused) or when a transfer ends. Reset the 65 * (which means unused) or when a transfer ends. Reset the
66 * timer when a xfer is queued. If the timer expires, release 66 * timer when a xfer is queued. If the timer expires, release
67 * the rpipe [see rpipe_ep_disable()]. 67 * the rpipe [see rpipe_ep_disable()].
@@ -140,7 +140,7 @@ struct wa_xfer {
140 140
141 struct wahc *wa; /* Wire adapter we are plugged to */ 141 struct wahc *wa; /* Wire adapter we are plugged to */
142 struct usb_host_endpoint *ep; 142 struct usb_host_endpoint *ep;
143 struct urb *urb; /* URB we are transfering for */ 143 struct urb *urb; /* URB we are transferring for */
144 struct wa_seg **seg; /* transfer segments */ 144 struct wa_seg **seg; /* transfer segments */
145 u8 segs, segs_submitted, segs_done; 145 u8 segs, segs_submitted, segs_done;
146 unsigned is_inbound:1; 146 unsigned is_inbound:1;
@@ -161,7 +161,7 @@ static inline void wa_xfer_init(struct wa_xfer *xfer)
161} 161}
162 162
163/* 163/*
164 * Destory a transfer structure 164 * Destroy a transfer structure
165 * 165 *
166 * Note that the xfer->seg[index] thingies follow the URB life cycle, 166 * Note that the xfer->seg[index] thingies follow the URB life cycle,
167 * so we need to put them, not free them. 167 * so we need to put them, not free them.
@@ -494,7 +494,7 @@ static void __wa_xfer_setup_hdr0(struct wa_xfer *xfer,
494 * function does almost the same thing and they work closely 494 * function does almost the same thing and they work closely
495 * together. 495 * together.
496 * 496 *
497 * If the seg request has failed but this DTO phase has suceeded, 497 * If the seg request has failed but this DTO phase has succeeded,
498 * wa_seg_cb() has already failed the segment and moved the 498 * wa_seg_cb() has already failed the segment and moved the
499 * status to WA_SEG_ERROR, so this will go through 'case 0' and 499 * status to WA_SEG_ERROR, so this will go through 'case 0' and
500 * effectively do nothing. 500 * effectively do nothing.
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h
index 6bd426b7ec0..3a2d09162e7 100644
--- a/drivers/usb/wusbcore/wusbhc.h
+++ b/drivers/usb/wusbcore/wusbhc.h
@@ -231,7 +231,7 @@ struct wusb_port {
231 * 231 *
232 * Most of the times when you need to use it, it will be non-NULL, 232 * Most of the times when you need to use it, it will be non-NULL,
233 * so there is no real need to check for it (wusb_dev will 233 * so there is no real need to check for it (wusb_dev will
234 * dissapear before usb_dev). 234 * disappear before usb_dev).
235 * 235 *
236 * - The following fields need to be filled out before calling 236 * - The following fields need to be filled out before calling
237 * wusbhc_create(): ports_max, mmcies_max, mmcie_{add,rm}. 237 * wusbhc_create(): ports_max, mmcies_max, mmcie_{add,rm}.