aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/atm/ueagle-atm.c2
-rw-r--r--drivers/usb/class/cdc-acm.c2
-rw-r--r--drivers/usb/gadget/at91_udc.h2
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.c2
-rw-r--r--drivers/usb/gadget/omap_udc.c2
-rw-r--r--drivers/usb/host/ehci-fsl.c2
-rw-r--r--drivers/usb/host/ehci-sched.c2
-rw-r--r--drivers/usb/host/r8a66597.h2
-rw-r--r--drivers/usb/misc/sisusbvga/sisusb.c2
-rw-r--r--drivers/usb/misc/usbtest.c2
-rw-r--r--drivers/usb/serial/io_edgeport.c8
-rw-r--r--drivers/usb/serial/mos7840.c8
12 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index fad5d916564..c5ec1a55eee 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -999,7 +999,7 @@ static void __uea_load_page_e4(struct uea_softc *sc, u8 pageno, int boot)
999 bi.dwAddress = swab32(blockidx->PageAddress); 999 bi.dwAddress = swab32(blockidx->PageAddress);
1000 1000
1001 uea_dbg(INS_TO_USBDEV(sc), 1001 uea_dbg(INS_TO_USBDEV(sc),
1002 "sending block %u for DSP page %u size %u adress %x\n", 1002 "sending block %u for DSP page %u size %u address %x\n",
1003 blockno, pageno, blocksize, le32_to_cpu(blockidx->PageAddress)); 1003 blockno, pageno, blocksize, le32_to_cpu(blockidx->PageAddress));
1004 1004
1005 /* send block info through the IDMA pipe */ 1005 /* send block info through the IDMA pipe */
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index b0f9873ce6b..bcc42136c93 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -915,7 +915,7 @@ next_desc:
915 } 915 }
916 916
917 if (data_interface_num != call_interface_num) 917 if (data_interface_num != call_interface_num)
918 dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n"); 918 dev_dbg(&intf->dev,"Separate call control interface. That is not fully supported.\n");
919 919
920skip_normal_probe: 920skip_normal_probe:
921 921
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index aecc7225a8c..f3095a90a0e 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -53,7 +53,7 @@
53#define AT91_UDP_RXRSM (1 << 9) /* USB Resume Interrupt Status */ 53#define AT91_UDP_RXRSM (1 << 9) /* USB Resume Interrupt Status */
54#define AT91_UDP_EXTRSM (1 << 10) /* External Resume Interrupt Status [AT91RM9200 only] */ 54#define AT91_UDP_EXTRSM (1 << 10) /* External Resume Interrupt Status [AT91RM9200 only] */
55#define AT91_UDP_SOFINT (1 << 11) /* Start of Frame Interrupt Status */ 55#define AT91_UDP_SOFINT (1 << 11) /* Start of Frame Interrupt Status */
56#define AT91_UDP_ENDBUSRES (1 << 12) /* End of Bus Reset Interrpt Status */ 56#define AT91_UDP_ENDBUSRES (1 << 12) /* End of Bus Reset Interrupt Status */
57#define AT91_UDP_WAKEUP (1 << 13) /* USB Wakeup Interrupt Status [AT91RM9200 only] */ 57#define AT91_UDP_WAKEUP (1 << 13) /* USB Wakeup Interrupt Status [AT91RM9200 only] */
58 58
59#define AT91_UDP_ICR 0x20 /* Interrupt Clear Register */ 59#define AT91_UDP_ICR 0x20 /* Interrupt Clear Register */
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index d59eb92a847..63e8fa3a69e 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1896,7 +1896,7 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
1896 1896
1897 spin_lock_irqsave(&udc->lock, flags); 1897 spin_lock_irqsave(&udc->lock, flags);
1898 1898
1899 /* ------basic driver infomation ---- */ 1899 /* ------basic driver information ---- */
1900 t = scnprintf(next, size, 1900 t = scnprintf(next, size,
1901 DRIVER_DESC "\n" 1901 DRIVER_DESC "\n"
1902 "%s version: %s\n" 1902 "%s version: %s\n"
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 7d6bef56cb0..e6d68bda428 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1028,7 +1028,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
1028 1028
1029 /* STATUS for zero length DATA stages is 1029 /* STATUS for zero length DATA stages is
1030 * always an IN ... even for IN transfers, 1030 * always an IN ... even for IN transfers,
1031 * a wierd case which seem to stall OMAP. 1031 * a weird case which seem to stall OMAP.
1032 */ 1032 */
1033 UDC_EP_NUM_REG = (UDC_EP_SEL|UDC_EP_DIR); 1033 UDC_EP_NUM_REG = (UDC_EP_SEL|UDC_EP_DIR);
1034 UDC_CTRL_REG = UDC_CLR_EP; 1034 UDC_CTRL_REG = UDC_CLR_EP;
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index f35795fbd89..adb0defa163 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -25,7 +25,7 @@
25 25
26#include "ehci-fsl.h" 26#include "ehci-fsl.h"
27 27
28/* FIXME: Power Managment is un-ported so temporarily disable it */ 28/* FIXME: Power Management is un-ported so temporarily disable it */
29#undef CONFIG_PM 29#undef CONFIG_PM
30 30
31/* PCI-based HCs are common, but plenty of non-PCI HCs are used too */ 31/* PCI-based HCs are common, but plenty of non-PCI HCs are used too */
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 80d99bce2b3..dce305bd62a 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -211,7 +211,7 @@ static inline void carryover_tt_bandwidth(unsigned short tt_usecs[8])
211 * low/fullspeed transfer can "carry over" from one uframe to the next, 211 * low/fullspeed transfer can "carry over" from one uframe to the next,
212 * since the TT just performs downstream transfers in sequence. 212 * since the TT just performs downstream transfers in sequence.
213 * 213 *
214 * For example two seperate 100 usec transfers can start in the same uframe, 214 * For example two separate 100 usec transfers can start in the same uframe,
215 * and the second one would "carry over" 75 usecs into the next uframe. 215 * and the second one would "carry over" 75 usecs into the next uframe.
216 */ 216 */
217static void 217static void
diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h
index fe9ceb077d9..57388252b69 100644
--- a/drivers/usb/host/r8a66597.h
+++ b/drivers/usb/host/r8a66597.h
@@ -405,7 +405,7 @@
405 405
406struct r8a66597_pipe_info { 406struct r8a66597_pipe_info {
407 u16 pipenum; 407 u16 pipenum;
408 u16 address; /* R8A66597 HCD usb addres */ 408 u16 address; /* R8A66597 HCD usb address */
409 u16 epnum; 409 u16 epnum;
410 u16 maxpacket; 410 u16 maxpacket;
411 u16 type; 411 u16 type;
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 8832a72bb1f..cb7fa0eaf3a 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -323,7 +323,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
323 usb_kill_urb(urb); 323 usb_kill_urb(urb);
324 retval = -ETIMEDOUT; 324 retval = -ETIMEDOUT;
325 } else { 325 } else {
326 /* URB completed within timout */ 326 /* URB completed within timeout */
327 retval = urb->status; 327 retval = urb->status;
328 readbytes = urb->actual_length; 328 readbytes = urb->actual_length;
329 } 329 }
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index f1b886c204c..da922dfc0dc 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1312,7 +1312,7 @@ static int ctrl_out (struct usbtest_dev *dev,
1312 len += vary; 1312 len += vary;
1313 1313
1314 /* [real world] the "zero bytes IN" case isn't really used. 1314 /* [real world] the "zero bytes IN" case isn't really used.
1315 * hardware can easily trip up in this wierd case, since its 1315 * hardware can easily trip up in this weird case, since its
1316 * status stage is IN, not OUT like other ep0in transfers. 1316 * status stage is IN, not OUT like other ep0in transfers.
1317 */ 1317 */
1318 if (len > length) 1318 if (len > length)
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index a5d2e115e16..3428ccc28da 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -959,7 +959,7 @@ static int edge_open (struct usb_serial_port *port, struct file * filp)
959 * 959 *
960 * This function will block the close until one of the following: 960 * This function will block the close until one of the following:
961 * 1. Response to our Chase comes from Edgeport 961 * 1. Response to our Chase comes from Edgeport
962 * 2. A timout of 10 seconds without activity has expired 962 * 2. A timeout of 10 seconds without activity has expired
963 * (1K of Edgeport data @ 2400 baud ==> 4 sec to empty) 963 * (1K of Edgeport data @ 2400 baud ==> 4 sec to empty)
964 * 964 *
965 ************************************************************************/ 965 ************************************************************************/
@@ -999,7 +999,7 @@ static void block_until_chase_response(struct edgeport_port *edge_port)
999 return; 999 return;
1000 } 1000 }
1001 } else { 1001 } else {
1002 // Reset timout value back to 10 seconds 1002 // Reset timeout value back to 10 seconds
1003 dbg("%s - Last %d, Current %d", __FUNCTION__, lastCredits, edge_port->txCredits); 1003 dbg("%s - Last %d, Current %d", __FUNCTION__, lastCredits, edge_port->txCredits);
1004 loop = 10; 1004 loop = 10;
1005 } 1005 }
@@ -1014,7 +1014,7 @@ static void block_until_chase_response(struct edgeport_port *edge_port)
1014 * This function will block the close until one of the following: 1014 * This function will block the close until one of the following:
1015 * 1. TX count are 0 1015 * 1. TX count are 0
1016 * 2. The edgeport has stopped 1016 * 2. The edgeport has stopped
1017 * 3. A timout of 3 seconds without activity has expired 1017 * 3. A timeout of 3 seconds without activity has expired
1018 * 1018 *
1019 ************************************************************************/ 1019 ************************************************************************/
1020static void block_until_tx_empty (struct edgeport_port *edge_port) 1020static void block_until_tx_empty (struct edgeport_port *edge_port)
@@ -1050,7 +1050,7 @@ static void block_until_tx_empty (struct edgeport_port *edge_port)
1050 return; 1050 return;
1051 } 1051 }
1052 } else { 1052 } else {
1053 // Reset timout value back to seconds 1053 // Reset timeout value back to seconds
1054 loop = 30; 1054 loop = 30;
1055 } 1055 }
1056 } 1056 }
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index c29c9127113..869ecd374cb 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1133,7 +1133,7 @@ static int mos7840_chars_in_buffer(struct usb_serial_port *port)
1133 * This function will block the close until one of the following: 1133 * This function will block the close until one of the following:
1134 * 1. TX count are 0 1134 * 1. TX count are 0
1135 * 2. The mos7840 has stopped 1135 * 2. The mos7840 has stopped
1136 * 3. A timout of 3 seconds without activity has expired 1136 * 3. A timeout of 3 seconds without activity has expired
1137 * 1137 *
1138 ************************************************************************/ 1138 ************************************************************************/
1139static void mos7840_block_until_tx_empty(struct moschip_port *mos7840_port) 1139static void mos7840_block_until_tx_empty(struct moschip_port *mos7840_port)
@@ -1161,7 +1161,7 @@ static void mos7840_block_until_tx_empty(struct moschip_port *mos7840_port)
1161 dbg("%s - TIMEOUT", __FUNCTION__); 1161 dbg("%s - TIMEOUT", __FUNCTION__);
1162 return; 1162 return;
1163 } else { 1163 } else {
1164 /* Reset timout value back to seconds */ 1164 /* Reset timeout value back to seconds */
1165 wait = 30; 1165 wait = 30;
1166 } 1166 }
1167 } 1167 }
@@ -1275,7 +1275,7 @@ static void mos7840_close(struct usb_serial_port *port, struct file *filp)
1275 * 1275 *
1276 * This function will block the close until one of the following: 1276 * This function will block the close until one of the following:
1277 * 1. Response to our Chase comes from mos7840 1277 * 1. Response to our Chase comes from mos7840
1278 * 2. A timout of 10 seconds without activity has expired 1278 * 2. A timeout of 10 seconds without activity has expired
1279 * (1K of mos7840 data @ 2400 baud ==> 4 sec to empty) 1279 * (1K of mos7840 data @ 2400 baud ==> 4 sec to empty)
1280 * 1280 *
1281 ************************************************************************/ 1281 ************************************************************************/
@@ -1304,7 +1304,7 @@ static void mos7840_block_until_chase_response(struct moschip_port
1304 dbg("%s - TIMEOUT", __FUNCTION__); 1304 dbg("%s - TIMEOUT", __FUNCTION__);
1305 return; 1305 return;
1306 } else { 1306 } else {
1307 /* Reset timout value back to seconds */ 1307 /* Reset timeout value back to seconds */
1308 wait = 10; 1308 wait = 10;
1309 } 1309 }
1310 } 1310 }