summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-08 14:48:41 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 17:26:06 (GMT)
commit720b3dfad42af96e3c937df8e167aac6c2901295 (patch)
treed5489e04aede987ae6e960248ac9ee04db125359
parentb31077a88a1242541b1c9b191c238ac313609d9f (diff)
downloadlinux-720b3dfad42af96e3c937df8e167aac6c2901295.tar.xz
[media] cx231xx: don't reset width/height on first open
The last set width/height must be preserved as per the spec. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-video.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index bdaa5e0..41c5c99 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1871,9 +1871,6 @@ static int cx231xx_v4l2_open(struct file *filp)
v4l2_fh_init(&fh->fh, vdev);
if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
- dev->width = norm_maxw(dev);
- dev->height = norm_maxh(dev);
-
/* Power up in Analog TV mode */
if (dev->board.external_av)
cx231xx_set_power_mode(dev,