diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-06 06:14:47 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 14:26:24 -0500 |
commit | e6066dba444903344c843dbdcb77a4823c51e7e3 (patch) | |
tree | 8c45c23c2b3850305e24ab058bac59a0453f79ef /drivers | |
parent | cc318180c8ec87ce692d1fbb22923f9e05871197 (diff) |
[media] [REVIEW] em28xx: fix bytesperline calculation in TRY_FMT
The bytesperline calculation was incorrect: it used the old width instead of
the provided width. Fixed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 2eabf2a94752..32bd7de5dec1 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -906,7 +906,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, | |||
906 | f->fmt.pix.width = width; | 906 | f->fmt.pix.width = width; |
907 | f->fmt.pix.height = height; | 907 | f->fmt.pix.height = height; |
908 | f->fmt.pix.pixelformat = fmt->fourcc; | 908 | f->fmt.pix.pixelformat = fmt->fourcc; |
909 | f->fmt.pix.bytesperline = (dev->width * fmt->depth + 7) >> 3; | 909 | f->fmt.pix.bytesperline = (width * fmt->depth + 7) >> 3; |
910 | f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * height; | 910 | f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * height; |
911 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; | 911 | f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; |
912 | if (dev->progressive) | 912 | if (dev->progressive) |