git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
platform
/
mtk-vpu
/
mtk_vpu.c
diff --git
a/drivers/media/platform/mtk-vpu/mtk_vpu.c
b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index e011c8dc019803c58fd28b14065df206bf7cd0cf..853d598937f69d4667ce5a28d078e53365c2b134 100644
(file)
--- a/
drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/
drivers/media/platform/mtk-vpu/mtk_vpu.c
@@
-590,7
+590,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 tim
e
out!\n");
goto OUT_LOAD_FW;
} else if (-ERESTARTSYS == ret) {
dev_err(dev, "wait vpu interrupted by a signal!\n");