summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc-v4l.c
diff options
context:
space:
mode:
authorHans de Goede2012-01-10 17:14:46 +0100
committerMauro Carvalho Chehab2012-01-16 14:08:57 +0100
commit938d5b9e7c2e20a7e609ad5874c6e7d8d391e6e9 (patch)
treeccd8b97d63894834c3ee7778ce10491ca27edffc /drivers/media/video/pwc/pwc-v4l.c
parent[media] pwc: Fix pixfmt handling (diff)
downloadkernel-qcow2-linux-938d5b9e7c2e20a7e609ad5874c6e7d8d391e6e9.tar.gz
kernel-qcow2-linux-938d5b9e7c2e20a7e609ad5874c6e7d8d391e6e9.tar.xz
kernel-qcow2-linux-938d5b9e7c2e20a7e609ad5874c6e7d8d391e6e9.zip
[media] pwc: Avoid sending mode info to the camera when it is not needed
Since we always do a set_video_mode on stream start, there is no need to actually send the mode info to the device on a s_fmt / s_parm ioctl. Not doing this saves us doing (slow) usb io. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc-v4l.c')
-rw-r--r--drivers/media/video/pwc/pwc-v4l.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index b275fad2927b..46feece38852 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -493,7 +493,7 @@ static int pwc_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f)
(pixelformat>>24)&255);
ret = pwc_set_video_mode(pdev, f->fmt.pix.width, f->fmt.pix.height,
- pixelformat, 30, &compression);
+ pixelformat, 30, &compression, 0);
PWC_DEBUG_IOCTL("pwc_set_video_mode(), return=%d\n", ret);
@@ -1137,7 +1137,7 @@ static int pwc_s_parm(struct file *file, void *fh,
}
ret = pwc_set_video_mode(pdev, pdev->width, pdev->height, pdev->pixfmt,
- fps, &compression);
+ fps, &compression, 0);
pwc_g_parm(file, fh, parm);