diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/media/usb/uvc/uvc_v4l2.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/media/usb/uvc/uvc_v4l2.c')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 60a8e2c3631e..378ae02e593b 100644 --- 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, | |||
| 318 | stream->ctrl = probe; | 318 | stream->ctrl = probe; |
| 319 | stream->cur_format = format; | 319 | stream->cur_format = format; |
| 320 | stream->cur_frame = frame; | 320 | stream->cur_frame = frame; |
| 321 | stream->frame_size = fmt->fmt.pix.sizeimage; | ||
| 322 | 321 | ||
| 323 | done: | 322 | done: |
| 324 | mutex_unlock(&stream->mutex); | 323 | mutex_unlock(&stream->mutex); |