Commit 7f37cc9b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

V4L/DVB (10710): zoran: cleanups in an attempt to make the source a bit more readable.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aff88bca
...@@ -919,15 +919,12 @@ zoran_check_jpg_settings (struct zoran *zr, ...@@ -919,15 +919,12 @@ zoran_check_jpg_settings (struct zoran *zr,
err0++; err0++;
if (settings->img_x + settings->img_width > BUZ_MAX_WIDTH) if (settings->img_x + settings->img_width > BUZ_MAX_WIDTH)
err0++; err0++;
if (settings->img_y + settings->img_height > if (settings->img_y + settings->img_height > BUZ_MAX_HEIGHT / 2)
BUZ_MAX_HEIGHT / 2)
err0++; err0++;
if (settings->HorDcm && settings->VerDcm) { if (settings->HorDcm && settings->VerDcm) {
if (settings->img_width % if (settings->img_width % (16 * settings->HorDcm) != 0)
(16 * settings->HorDcm) != 0)
err0++; err0++;
if (settings->img_height % if (settings->img_height % (8 * settings->VerDcm) != 0)
(8 * settings->VerDcm) != 0)
err0++; err0++;
} }
......
This diff is collapsed.
...@@ -2314,7 +2314,7 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh, ...@@ -2314,7 +2314,7 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh,
} }
/* we actually need to set 'real' parameters now */ /* we actually need to set 'real' parameters now */
if ((fmt->fmt.pix.height * 2) > BUZ_MAX_HEIGHT) if (fmt->fmt.pix.height * 2 > BUZ_MAX_HEIGHT)
settings.TmpDcm = 1; settings.TmpDcm = 1;
else else
settings.TmpDcm = 2; settings.TmpDcm = 2;
...@@ -2501,7 +2501,7 @@ static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffe ...@@ -2501,7 +2501,7 @@ static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffe
if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) { if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) {
dprintk(1, dprintk(1,
KERN_ERR KERN_ERR
"%s: VIDIOC_REQBUFS - buffers allready allocated\n", "%s: VIDIOC_REQBUFS - buffers already allocated\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EBUSY; res = -EBUSY;
goto v4l2reqbuf_unlock_and_return; goto v4l2reqbuf_unlock_and_return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment