diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
commit | 89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch) | |
tree | c20880998ad9a212c83818eb3b62eaacab45a1fa /drivers/media/platform | |
parent | 76f1948a79b26d5f57a5ee9941876b745c6baaea (diff) | |
parent | 6fbc8798d9461c0ff22fab9fbaddde13de815941 (diff) | |
download | linux-89c9fea3c8034cdb2fd745f551cde0b507fd6893.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tty: fix comment for __tty_alloc_driver()
init/main: properly align the multi-line comment
init/main: Fix double "the" in comment
Fix dead URLs to ftp.kernel.org
drivers: Clean up duplicated email address
treewide: Fix typo in xml/driver-api/basics.xml
tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
selftests/timers: Spelling s/privledges/privileges/
HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
net: phy: dp83848: Fix Typo
UBI: Fix typos
Documentation: ftrace.txt: Correct nice value of 120 priority
net: fec: Fix typo in error msg and comment
treewide: Fix typos in printk
Diffstat (limited to 'drivers/media/platform')
-rw-r--r-- | drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c index 463b69c934be..aa44e11decca 100644 --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c @@ -589,7 +589,7 @@ int vpu_load_firmware(struct platform_device *pdev) ); if (ret == 0) { ret = -ETIME; - dev_err(dev, "wait vpu initialization timout!\n"); + dev_err(dev, "wait vpu initialization timeout!\n"); goto OUT_LOAD_FW; } else if (-ERESTARTSYS == ret) { dev_err(dev, "wait vpu interrupted by a signal!\n"); |