diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/media | |
| 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/media')
| -rw-r--r-- | drivers/media/dvb-frontends/drxk_hard.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/mx2_emmaprp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 8b4c6d5f8f3..df9abe83f87 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state) state->m_oscClockFreq = 20250; break; default: - printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); + printk(KERN_ERR "drxk: Clock Frequency is unknown\n"); return -EINVAL; } /* diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c index 8f22ce543cf..bfa65079fc3 100644 --- a/drivers/media/platform/mx2_emmaprp.c +++ b/drivers/media/platform/mx2_emmaprp.c @@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data) if (!curr_ctx->aborting) { if ((irqst & PRP_INTR_ST_RDERR) || (irqst & PRP_INTR_ST_CH2WERR)) { - pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); + pr_err("PrP bus error occurred, this transfer is probably corrupted\n"); writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); |