diff options
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index 8b26b3fefb1e..4a47f61d9486 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -171,7 +171,6 @@ static int cx18_try_fmt_vid_cap(struct file *file, void *fh, | |||
171 | { | 171 | { |
172 | struct cx18_open_id *id = fh; | 172 | struct cx18_open_id *id = fh; |
173 | struct cx18 *cx = id->cx; | 173 | struct cx18 *cx = id->cx; |
174 | |||
175 | int w = fmt->fmt.pix.width; | 174 | int w = fmt->fmt.pix.width; |
176 | int h = fmt->fmt.pix.height; | 175 | int h = fmt->fmt.pix.height; |
177 | 176 | ||
@@ -203,8 +202,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, | |||
203 | struct cx18_open_id *id = fh; | 202 | struct cx18_open_id *id = fh; |
204 | struct cx18 *cx = id->cx; | 203 | struct cx18 *cx = id->cx; |
205 | int ret; | 204 | int ret; |
206 | int w = fmt->fmt.pix.width; | 205 | int w, h; |
207 | int h = fmt->fmt.pix.height; | ||
208 | 206 | ||
209 | ret = v4l2_prio_check(&cx->prio, &id->prio); | 207 | ret = v4l2_prio_check(&cx->prio, &id->prio); |
210 | if (ret) | 208 | if (ret) |
@@ -213,6 +211,8 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, | |||
213 | ret = cx18_try_fmt_vid_cap(file, fh, fmt); | 211 | ret = cx18_try_fmt_vid_cap(file, fh, fmt); |
214 | if (ret) | 212 | if (ret) |
215 | return ret; | 213 | return ret; |
214 | w = fmt->fmt.pix.width; | ||
215 | h = fmt->fmt.pix.height; | ||
216 | 216 | ||
217 | if (cx->params.width == w && cx->params.height == h) | 217 | if (cx->params.width == w && cx->params.height == h) |
218 | return 0; | 218 | return 0; |