aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran/zoran_driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-18 15:00:37 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:56 -0400
commit7f37cc9bae7aa29d567460c3ac8178d587f710bc (patch)
treec57ec377e502cfcef0acdcf53016434dc74e98a3 /drivers/media/video/zoran/zoran_driver.c
parentaff88bca73a16039ed0988660dc7ab755c3e1741 (diff)
V4L/DVB (10710): zoran: cleanups in an attempt to make the source a bit more readable.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran/zoran_driver.c')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 0e4b8d03fda3..0cce652011ff 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -2314,7 +2314,7 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh,
2314 } 2314 }
2315 2315
2316 /* we actually need to set 'real' parameters now */ 2316 /* we actually need to set 'real' parameters now */
2317 if ((fmt->fmt.pix.height * 2) > BUZ_MAX_HEIGHT) 2317 if (fmt->fmt.pix.height * 2 > BUZ_MAX_HEIGHT)
2318 settings.TmpDcm = 1; 2318 settings.TmpDcm = 1;
2319 else 2319 else
2320 settings.TmpDcm = 2; 2320 settings.TmpDcm = 2;
@@ -2501,7 +2501,7 @@ static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffe
2501 if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) { 2501 if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) {
2502 dprintk(1, 2502 dprintk(1,
2503 KERN_ERR 2503 KERN_ERR
2504 "%s: VIDIOC_REQBUFS - buffers allready allocated\n", 2504 "%s: VIDIOC_REQBUFS - buffers already allocated\n",
2505 ZR_DEVNAME(zr)); 2505 ZR_DEVNAME(zr));
2506 res = -EBUSY; 2506 res = -EBUSY;
2507 goto v4l2reqbuf_unlock_and_return; 2507 goto v4l2reqbuf_unlock_and_return;