diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/cytherm.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/emi26.c | 4 | ||||
-rw-r--r-- | drivers/usb/misc/emi62.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ChangeLog.history | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 6 | ||||
-rw-r--r-- | drivers/usb/serial/ipaq.c | 4 | ||||
-rw-r--r-- | drivers/usb/storage/isd200.c | 2 | ||||
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 4 |
10 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index e78c2ddc1f88..367b75c0b25b 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -1272,7 +1272,7 @@ static int lh7a40x_set_halt(struct usb_ep *_ep, int value) | |||
1272 | /* | 1272 | /* |
1273 | * Attempts to halt IN endpoints will fail (returning -EAGAIN) | 1273 | * Attempts to halt IN endpoints will fail (returning -EAGAIN) |
1274 | * if any transfer requests are still queued, or if the controller | 1274 | * if any transfer requests are still queued, or if the controller |
1275 | * FIFO still holds bytes that the host hasn’t collected. | 1275 | * FIFO still holds bytes that the host hasn't collected. |
1276 | */ | 1276 | */ |
1277 | spin_unlock_irqrestore(&ep->dev->lock, flags); | 1277 | spin_unlock_irqrestore(&ep->dev->lock, flags); |
1278 | DEBUG | 1278 | DEBUG |
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index 04e87acd6e46..2677fea147d9 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
@@ -118,7 +118,7 @@ static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, | |||
118 | cytherm->brightness, buffer, 8); | 118 | cytherm->brightness, buffer, 8); |
119 | if (retval) | 119 | if (retval) |
120 | dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); | 120 | dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); |
121 | /* Inform µC that we have changed the brightness setting */ | 121 | /* Inform µC that we have changed the brightness setting */ |
122 | retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, | 122 | retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, |
123 | 0x01, buffer, 8); | 123 | 0x01, buffer, 8); |
124 | if (retval) | 124 | if (retval) |
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c index 5c0a26cbd128..cd137577bb2d 100644 --- a/drivers/usb/misc/emi26.c +++ b/drivers/usb/misc/emi26.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Emagic EMI 2|6 usb audio interface firmware loader. | 2 | * Emagic EMI 2|6 usb audio interface firmware loader. |
3 | * Copyright (C) 2002 | 3 | * Copyright (C) 2002 |
4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) | 4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License, as published by | 7 | * it under the terms of the GNU General Public License, as published by |
@@ -249,7 +249,7 @@ static void __exit emi26_exit (void) | |||
249 | module_init(emi26_init); | 249 | module_init(emi26_init); |
250 | module_exit(emi26_exit); | 250 | module_exit(emi26_exit); |
251 | 251 | ||
252 | MODULE_AUTHOR("tapio laxström"); | 252 | MODULE_AUTHOR("Tapio Laxström"); |
253 | MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); | 253 | MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); |
254 | MODULE_LICENSE("GPL"); | 254 | MODULE_LICENSE("GPL"); |
255 | 255 | ||
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 23153eac0dfa..4758cc5ccebc 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Emagic EMI 2|6 usb audio interface firmware loader. | 2 | * Emagic EMI 2|6 usb audio interface firmware loader. |
3 | * Copyright (C) 2002 | 3 | * Copyright (C) 2002 |
4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) | 4 | * Tapio Laxström (tapio.laxstrom@iptime.fi) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License, as published by | 7 | * it under the terms of the GNU General Public License, as published by |
@@ -292,7 +292,7 @@ static void __exit emi62_exit (void) | |||
292 | module_init(emi62_init); | 292 | module_init(emi62_init); |
293 | module_exit(emi62_exit); | 293 | module_exit(emi62_exit); |
294 | 294 | ||
295 | MODULE_AUTHOR("tapio laxström"); | 295 | MODULE_AUTHOR("Tapio Laxström"); |
296 | MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); | 296 | MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); |
297 | MODULE_LICENSE("GPL"); | 297 | MODULE_LICENSE("GPL"); |
298 | 298 | ||
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history index 52c4f7bd7a80..c1b279939bbf 100644 --- a/drivers/usb/serial/ChangeLog.history +++ b/drivers/usb/serial/ChangeLog.history | |||
@@ -400,7 +400,7 @@ visor.c Change Log comments: | |||
400 | 400 | ||
401 | (11/11/2001) gkh | 401 | (11/11/2001) gkh |
402 | Added support for the m125 devices, and added check to prevent oopses | 402 | Added support for the m125 devices, and added check to prevent oopses |
403 | for Clié devices that lie about the number of ports they have. | 403 | for Clié devices that lie about the number of ports they have. |
404 | 404 | ||
405 | (08/30/2001) gkh | 405 | (08/30/2001) gkh |
406 | Added support for the Clie devices, both the 3.5 and 4.0 os versions. | 406 | Added support for the Clie devices, both the 3.5 and 4.0 os versions. |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 65257867b34b..8a8a6b9fb05b 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -83,7 +83,7 @@ | |||
83 | * | 83 | * |
84 | * (18/Jun/2003) Ian Abbott | 84 | * (18/Jun/2003) Ian Abbott |
85 | * Added Device ID of the USB relais from Rudolf Gugler (backported from | 85 | * Added Device ID of the USB relais from Rudolf Gugler (backported from |
86 | * Philipp Gühring's patch for 2.5.x kernel). | 86 | * Philipp Gühring's patch for 2.5.x kernel). |
87 | * Moved read transfer buffer reallocation into startup function. | 87 | * Moved read transfer buffer reallocation into startup function. |
88 | * Free existing write urb and transfer buffer in startup function. | 88 | * Free existing write urb and transfer buffer in startup function. |
89 | * Only use urbs in write urb pool that were successfully allocated. | 89 | * Only use urbs in write urb pool that were successfully allocated. |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index b57b90ae9f9d..b51cbb0eaa05 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the | 17 | * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the |
18 | * FTDI_SIO implementation. | 18 | * FTDI_SIO implementation. |
19 | * | 19 | * |
20 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais | 20 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais |
21 | * from Rudolf Gugler | 21 | * from Rudolf Gugler |
22 | * | 22 | * |
23 | */ | 23 | */ |
@@ -44,7 +44,7 @@ | |||
44 | #define FTDI_ACTZWAVE_PID 0xF2D0 | 44 | #define FTDI_ACTZWAVE_PID 0xF2D0 |
45 | 45 | ||
46 | 46 | ||
47 | /* www.starting-point-systems.com µChameleon device */ | 47 | /* www.starting-point-systems.com µChameleon device */ |
48 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ | 48 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ |
49 | 49 | ||
50 | /* www.irtrans.de device */ | 50 | /* www.irtrans.de device */ |
@@ -419,7 +419,7 @@ | |||
419 | 419 | ||
420 | /* | 420 | /* |
421 | * Teratronik product ids. | 421 | * Teratronik product ids. |
422 | * Submitted by O. Wölfelschneider. | 422 | * Submitted by O. Wölfelschneider. |
423 | */ | 423 | */ |
424 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ | 424 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ |
425 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ | 425 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index e836ad07fdb9..9b38a08ac83a 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -306,7 +306,7 @@ static struct usb_device_id ipaq_id_table [] = { | |||
306 | { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ | 306 | { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ |
307 | { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ | 307 | { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ |
308 | { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ | 308 | { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ |
309 | { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */ | 309 | { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */ |
310 | { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ | 310 | { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ |
311 | { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ | 311 | { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ |
312 | { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ | 312 | { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ |
@@ -488,7 +488,7 @@ static struct usb_device_id ipaq_id_table [] = { | |||
488 | { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ | 488 | { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ |
489 | { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ | 489 | { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ |
490 | { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ | 490 | { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ |
491 | { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */ | 491 | { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */ |
492 | { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ | 492 | { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ |
493 | { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ | 493 | { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ |
494 | { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ | 494 | { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ |
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 6831dca93c1b..93a7724e167a 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ | 3 | * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ |
4 | * | 4 | * |
5 | * Current development and maintenance: | 5 | * Current development and maintenance: |
6 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) | 6 | * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) |
7 | * | 7 | * |
8 | * Developed with the assistance of: | 8 | * Developed with the assistance of: |
9 | * (C) 2002 Alan Stern <stern@rowland.org> | 9 | * (C) 2002 Alan Stern <stern@rowland.org> |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 9b656ec427d0..22ab2380367d 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -407,7 +407,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, | |||
407 | "FinePix 1400Zoom", | 407 | "FinePix 1400Zoom", |
408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), | 408 | US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), |
409 | 409 | ||
410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> | 410 | /* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> |
411 | * The device needs the flags only. | 411 | * The device needs the flags only. |
412 | */ | 412 | */ |
413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, | 413 | UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, |
@@ -1551,7 +1551,7 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, | |||
1551 | US_FL_GO_SLOW ), | 1551 | US_FL_GO_SLOW ), |
1552 | 1552 | ||
1553 | /* | 1553 | /* |
1554 | * David Härdeman <david@2gen.com> | 1554 | * David Härdeman <david@2gen.com> |
1555 | * The key makes the SCSI stack print confusing (but harmless) messages | 1555 | * The key makes the SCSI stack print confusing (but harmless) messages |
1556 | */ | 1556 | */ |
1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, | 1557 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, |