diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/firewire | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/init_ohci1394_dma.c | 4 | ||||
-rw-r--r-- | drivers/firewire/ohci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/init_ohci1394_dma.c b/drivers/firewire/init_ohci1394_dma.c index a9a347adb353..2cc89ce745c9 100644 --- a/drivers/firewire/init_ohci1394_dma.c +++ b/drivers/firewire/init_ohci1394_dma.c | |||
@@ -149,10 +149,10 @@ static inline void __init init_ohci1394_initialize(struct ohci *ohci) | |||
149 | reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); | 149 | reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); |
150 | reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); | 150 | reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); |
151 | 151 | ||
152 | /* Accept asyncronous transfer requests from all nodes for now */ | 152 | /* Accept asynchronous transfer requests from all nodes for now */ |
153 | reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); | 153 | reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); |
154 | 154 | ||
155 | /* Specify asyncronous transfer retries */ | 155 | /* Specify asynchronous transfer retries */ |
156 | reg_write(ohci, OHCI1394_ATRetries, | 156 | reg_write(ohci, OHCI1394_ATRetries, |
157 | OHCI1394_MAX_AT_REQ_RETRIES | | 157 | OHCI1394_MAX_AT_REQ_RETRIES | |
158 | (OHCI1394_MAX_AT_RESP_RETRIES<<4) | | 158 | (OHCI1394_MAX_AT_RESP_RETRIES<<4) | |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index f25610bb3148..6ce6e07c38c1 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -1281,7 +1281,7 @@ static int at_context_queue_packet(struct context *ctx, | |||
1281 | d[0].res_count = cpu_to_le16(packet->timestamp); | 1281 | d[0].res_count = cpu_to_le16(packet->timestamp); |
1282 | 1282 | ||
1283 | /* | 1283 | /* |
1284 | * The DMA format for asyncronous link packets is different | 1284 | * The DMA format for asynchronous link packets is different |
1285 | * from the IEEE1394 layout, so shift the fields around | 1285 | * from the IEEE1394 layout, so shift the fields around |
1286 | * accordingly. | 1286 | * accordingly. |
1287 | */ | 1287 | */ |