projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
media
/
usb
/
uvc
/
uvc_v4l2.c
diff --git
a/drivers/media/usb/uvc/uvc_v4l2.c
b/drivers/media/usb/uvc/uvc_v4l2.c
index
60a8e2c
..
378ae02
100644
(file)
--- a/
drivers/media/usb/uvc/uvc_v4l2.c
+++ b/
drivers/media/usb/uvc/uvc_v4l2.c
@@
-318,7
+318,6
@@
static int uvc_v4l2_set_format(struct uvc_streaming *stream,
stream->ctrl = probe;
stream->cur_format = format;
stream->cur_frame = frame;
- stream->frame_size = fmt->fmt.pix.sizeimage;
done:
mutex_unlock(&stream->mutex);