summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-23 06:54:44 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-20 12:31:40 -0800
commit56a766f0fe6e932dc2ecd6aac2e33861027d31c2 (patch)
tree3ce07973d41f11f509d1073fbb2f9b3b76654e11
parent1e7c2cd28dc4ea3a86266fcfd07700e3911716a5 (diff)
downloadkernel-common-56a766f0fe6e932dc2ecd6aac2e33861027d31c2.tar.gz
kernel-common-56a766f0fe6e932dc2ecd6aac2e33861027d31c2.tar.bz2
kernel-common-56a766f0fe6e932dc2ecd6aac2e33861027d31c2.zip
media: sh_vou: almost forever loop in sh_vou_try_fmt_vid_out()
commit 47c32ec9392a1fc7dec9d7cfde084e1432fcee82 upstream. The "i < " part of the "i < ARRAY_SIZE()" condition was missing. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> [g.liakhovetski@gmx.de: remove unrelated superfluous braces] Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/platform/sh_vou.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 7a9c5e9329f2..4f30341dc2ab 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -776,7 +776,7 @@ static int sh_vou_try_fmt_vid_out(struct file *file, void *priv,
v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1,
&pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0);
- for (i = 0; ARRAY_SIZE(vou_fmt); i++)
+ for (i = 0; i < ARRAY_SIZE(vou_fmt); i++)
if (vou_fmt[i].pfmt == pix->pixelformat)
return 0;