[media] cx231xx: don't reset width/height on first open
authorHans Verkuil <hans.verkuil@cisco.com>
Fri, 8 Feb 2013 14:48:41 +0000 (11:48 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 5 Mar 2013 17:26:06 +0000 (14:26 -0300)
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>
drivers/media/usb/cx231xx/cx231xx-video.c

index bdaa5e01bb4759a072ab5d9a578ba0e617d52b1f..41c5c996ed2c76778d14e25210933722f30a1106 100644 (file)
@@ -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,