diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/usb/gadget | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/f_acm.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index 7953948bfe4a..4e3657808b0f 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c | |||
@@ -432,7 +432,7 @@ static void acm_disable(struct usb_function *f) | |||
432 | * @length: size of data | 432 | * @length: size of data |
433 | * Context: irqs blocked, acm->lock held, acm_notify_req non-null | 433 | * Context: irqs blocked, acm->lock held, acm_notify_req non-null |
434 | * | 434 | * |
435 | * Returns zero on sucess or a negative errno. | 435 | * Returns zero on success or a negative errno. |
436 | * | 436 | * |
437 | * See section 6.3.5 of the CDC 1.1 specification for information | 437 | * See section 6.3.5 of the CDC 1.1 specification for information |
438 | * about the only notification we issue: SerialState change. | 438 | * about the only notification we issue: SerialState change. |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 1937d8c7b433..adda1208a1ec 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -1524,7 +1524,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget) | |||
1524 | * pxa_udc_wakeup - Force udc device out of suspend | 1524 | * pxa_udc_wakeup - Force udc device out of suspend |
1525 | * @_gadget: usb gadget | 1525 | * @_gadget: usb gadget |
1526 | * | 1526 | * |
1527 | * Returns 0 if succesfull, error code otherwise | 1527 | * Returns 0 if successfull, error code otherwise |
1528 | */ | 1528 | */ |
1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) | 1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) |
1530 | { | 1530 | { |