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 | |
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')
-rw-r--r-- | drivers/usb/atm/ueagle-atm.c | 2 | ||||
-rw-r--r-- | drivers/usb/class/usbtmc.c | 2 | ||||
-rw-r--r-- | drivers/usb/core/message.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/f_acm.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/fhci-sched.c | 2 | ||||
-rw-r--r-- | drivers/usb/wusbcore/crypto.c | 2 | ||||
-rw-r--r-- | drivers/usb/wusbcore/wa-xfer.c | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index d171b563e94c..bba4d3eabe0f 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
@@ -1958,7 +1958,7 @@ static void uea_dispatch_cmv_e1(struct uea_softc *sc, struct intr_pkt *intr) | |||
1958 | goto bad1; | 1958 | goto bad1; |
1959 | 1959 | ||
1960 | /* FIXME : ADI930 reply wrong preambule (func = 2, sub = 2) to | 1960 | /* FIXME : ADI930 reply wrong preambule (func = 2, sub = 2) to |
1961 | * the first MEMACESS cmv. Ignore it... | 1961 | * the first MEMACCESS cmv. Ignore it... |
1962 | */ | 1962 | */ |
1963 | if (cmv->bFunction != dsc->function) { | 1963 | if (cmv->bFunction != dsc->function) { |
1964 | if (UEA_CHIP_VERSION(sc) == ADI930 | 1964 | if (UEA_CHIP_VERSION(sc) == ADI930 |
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 2473cf0c6b1d..b4bd2411c666 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * drivers/usb/class/usbtmc.c - USB Test & Measurment class driver | 2 | * drivers/usb/class/usbtmc.c - USB Test & Measurement class driver |
3 | * | 3 | * |
4 | * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany | 4 | * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany |
5 | * Copyright (C) 2008 Novell, Inc. | 5 | * Copyright (C) 2008 Novell, Inc. |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index da718e84d58d..e80f1af438c8 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1890,7 +1890,7 @@ static void cancel_async_set_config(struct usb_device *udev) | |||
1890 | * routine gets around the normal restrictions by using a work thread to | 1890 | * routine gets around the normal restrictions by using a work thread to |
1891 | * submit the change-config request. | 1891 | * submit the change-config request. |
1892 | * | 1892 | * |
1893 | * Returns 0 if the request was succesfully queued, error code otherwise. | 1893 | * Returns 0 if the request was successfully queued, error code otherwise. |
1894 | * The caller has no way to know whether the queued request will eventually | 1894 | * The caller has no way to know whether the queued request will eventually |
1895 | * succeed. | 1895 | * succeed. |
1896 | */ | 1896 | */ |
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 | { |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index f5f5601701c9..d8f4aaa616f2 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -210,7 +210,7 @@ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr, | |||
210 | if (error) { | 210 | if (error) { |
211 | ehci_halt(ehci); | 211 | ehci_halt(ehci); |
212 | ehci_to_hcd(ehci)->state = HC_STATE_HALT; | 212 | ehci_to_hcd(ehci)->state = HC_STATE_HALT; |
213 | ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n", | 213 | ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n", |
214 | ptr, mask, done, error); | 214 | ptr, mask, done, error); |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 62a226b61670..00a29855d0c4 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c | |||
@@ -627,7 +627,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) | |||
627 | 627 | ||
628 | 628 | ||
629 | /* | 629 | /* |
630 | * Process normal completions(error or sucess) and clean the schedule. | 630 | * Process normal completions(error or success) and clean the schedule. |
631 | * | 631 | * |
632 | * This is the main path for handing urbs back to drivers. The only other patth | 632 | * This is the main path for handing urbs back to drivers. The only other patth |
633 | * is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning | 633 | * is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning |
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c index 9ec7fd5da489..9579cf4c38bf 100644 --- a/drivers/usb/wusbcore/crypto.c +++ b/drivers/usb/wusbcore/crypto.c | |||
@@ -111,7 +111,7 @@ struct aes_ccm_b1 { | |||
111 | * | 111 | * |
112 | * CCM uses Ax blocks to generate a keystream with which the MIC and | 112 | * CCM uses Ax blocks to generate a keystream with which the MIC and |
113 | * the message's payload are encoded. A0 always encrypts/decrypts the | 113 | * the message's payload are encoded. A0 always encrypts/decrypts the |
114 | * MIC. Ax (x>0) are used for the sucesive payload blocks. | 114 | * MIC. Ax (x>0) are used for the successive payload blocks. |
115 | * | 115 | * |
116 | * The x is the counter, and is increased for each block. | 116 | * The x is the counter, and is increased for each block. |
117 | */ | 117 | */ |
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 613a5fc490d3..489b47833e2c 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c | |||
@@ -558,7 +558,7 @@ static void wa_seg_dto_cb(struct urb *urb) | |||
558 | /* | 558 | /* |
559 | * Callback for the segment request | 559 | * Callback for the segment request |
560 | * | 560 | * |
561 | * If succesful transition state (unless already transitioned or | 561 | * If successful transition state (unless already transitioned or |
562 | * outbound transfer); otherwise, take a note of the error, mark this | 562 | * outbound transfer); otherwise, take a note of the error, mark this |
563 | * segment done and try completion. | 563 | * segment done and try completion. |
564 | * | 564 | * |
@@ -1364,7 +1364,7 @@ segment_aborted: | |||
1364 | /* | 1364 | /* |
1365 | * Callback for the IN data phase | 1365 | * Callback for the IN data phase |
1366 | * | 1366 | * |
1367 | * If succesful transition state; otherwise, take a note of the | 1367 | * If successful transition state; otherwise, take a note of the |
1368 | * error, mark this segment done and try completion. | 1368 | * error, mark this segment done and try completion. |
1369 | * | 1369 | * |
1370 | * Note we don't access until we are sure that the transfer hasn't | 1370 | * Note we don't access until we are sure that the transfer hasn't |