diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 00:21:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 00:21:55 -0500 |
commit | bb1281f2aae08e5ef23eb0692c8833e95579cdf2 (patch) | |
tree | e00abd368a90eb947df37ba1e6082c864635cb80 /drivers/usb | |
parent | 4988abf1749241bc80600a6b3283d03898d2717c (diff) | |
parent | c04e7da0133fbe7f799b9356982371d228df9994 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science stuff from trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
neighbour.h: fix comment
sched: Fix warning on make htmldocs caused by wait.h
slab: struct kmem_cache is protected by slab_mutex
doc: Fix typo in USB Gadget Documentation
of/Kconfig: Spelling s/one/once/
mkregtable: Fix sscanf handling
lp5523, lp8501: comment improvements
thermal: rcar: comment spelling
treewide: fix comments and printk msgs
IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
Documentation: update /proc/uptime field description
Documentation: Fix size parameter for snprintf
arm: fix comment header and macro name
asm-generic: uaccess: Spelling s/a ny/any/
mtd: onenand: fix comment header
doc: driver-model/platform.txt: fix a typo
drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
doc: Fix typo (acces_process_vm -> access_process_vm)
treewide: Fix typos in printk
drivers/gpu/drm/qxl/Kconfig: reformat the help text
...
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/kobil_sct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index d8d164b82dc3..618c1c1f227e 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
@@ -193,7 +193,7 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
193 | KOBIL_TIMEOUT | 193 | KOBIL_TIMEOUT |
194 | ); | 194 | ); |
195 | dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result); | 195 | dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result); |
196 | dev_dbg(dev, "Harware version: %i.%i.%i\n", transfer_buffer[0], | 196 | dev_dbg(dev, "Hardware version: %i.%i.%i\n", transfer_buffer[0], |
197 | transfer_buffer[1], transfer_buffer[2]); | 197 | transfer_buffer[1], transfer_buffer[2]); |
198 | 198 | ||
199 | /* get firmware version */ | 199 | /* get firmware version */ |