diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 16:23:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 16:23:38 -0700 |
| commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
| tree | dd9b0204d90b25e1e0be933348776f09434333c6 /drivers/usb/core | |
| parent | 05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff) | |
| parent | c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff) | |
| download | op-kernel-dev-159d8133d0b54a501a41a66fe3a0e7d16405e36d.zip op-kernel-dev-159d8133d0b54a501a41a66fe3a0e7d16405e36d.tar.gz | |
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 -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/core/message.c | 2 | ||||
| -rw-r--r-- | drivers/usb/core/urb.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index fed7f68..cb8e9915 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -10,7 +10,6 @@ config USB_DEBUG config USB_ANNOUNCE_NEW_DEVICES bool "USB announce new devices" - default N help Say Y here if you want the USB core to always announce the idVendor, idProduct, Manufacturer, Product, and SerialNumber diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 3cdcd0a..0c8a7fc 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -178,7 +178,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg); * * Return: * If successful, 0. Otherwise a negative error number. The number of actual - * bytes transferred will be stored in the @actual_length paramater. + * bytes transferred will be stored in the @actual_length parameter. */ int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, void *data, int len, int *actual_length, int timeout) diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index 9ff665f..991386c 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c @@ -831,7 +831,7 @@ EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs); * * this allows all outstanding URBs to be unlinked starting * from the back of the queue. This function is asynchronous. - * The unlinking is just tiggered. It may happen after this + * The unlinking is just triggered. It may happen after this * function has returned. * * This routine should not be called by a driver after its disconnect |
