diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-ioctl.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index 2530fc54daaf..20eaf38ba959 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Derived from ivtv-ioctl.c | 4 | * Derived from ivtv-ioctl.c |
5 | * | 5 | * |
6 | * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> | 6 | * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl> |
7 | * Copyright (C) 2008 Andy Walls <awalls@radix.net> | 7 | * Copyright (C) 2008 Andy Walls <awalls@md.metrocast.net> |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
@@ -274,6 +274,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, | |||
274 | { | 274 | { |
275 | struct cx18_open_id *id = fh; | 275 | struct cx18_open_id *id = fh; |
276 | struct cx18 *cx = id->cx; | 276 | struct cx18 *cx = id->cx; |
277 | struct v4l2_mbus_framefmt mbus_fmt; | ||
277 | int ret; | 278 | int ret; |
278 | int w, h; | 279 | int w, h; |
279 | 280 | ||
@@ -293,9 +294,10 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, | |||
293 | if (atomic_read(&cx->ana_capturing) > 0) | 294 | if (atomic_read(&cx->ana_capturing) > 0) |
294 | return -EBUSY; | 295 | return -EBUSY; |
295 | 296 | ||
296 | cx->params.width = w; | 297 | mbus_fmt.width = cx->params.width = w; |
297 | cx->params.height = h; | 298 | mbus_fmt.height = cx->params.height = h; |
298 | v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt); | 299 | mbus_fmt.code = V4L2_MBUS_FMT_FIXED; |
300 | v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &mbus_fmt); | ||
299 | return cx18_g_fmt_vid_cap(file, fh, fmt); | 301 | return cx18_g_fmt_vid_cap(file, fh, fmt); |
300 | } | 302 | } |
301 | 303 | ||