From a3b7a6504c4d80d2c2a775352f438e9f3722a781 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 11 Mar 2013 16:12:17 -0300 Subject: [PATCH] --- yaml --- r: 366867 b: refs/heads/master c: de8d2bbf0a6bebce51a2ab08adbb0dd897825777 h: refs/heads/master i: 366865: ecc5ef4e4e00e0f41efb56441ebe8cf3fd6c4596 366863: 85d22ccd1423d79c2bc3a22956a50f54080a7025 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/au0828/au0828-video.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ad673d010cc3..b9c7b36138f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa09cb9a992be135fa6f3ac8a0841c478f29d844 +refs/heads/master: de8d2bbf0a6bebce51a2ab08adbb0dd897825777 diff --git a/trunk/drivers/media/usb/au0828/au0828-video.c b/trunk/drivers/media/usb/au0828/au0828-video.c index 2f24e54cb837..6f2a6264d173 100644 --- a/trunk/drivers/media/usb/au0828/au0828-video.c +++ b/trunk/drivers/media/usb/au0828/au0828-video.c @@ -1005,11 +1005,6 @@ static int au0828_v4l2_open(struct file *filp) printk(KERN_INFO "Au0828 can't set alternate to 5!\n"); return -EBUSY; } - dev->width = NTSC_STD_W; - dev->height = NTSC_STD_H; - dev->frame_size = dev->width * dev->height * 2; - dev->field_size = dev->width * dev->height; - dev->bytesperline = dev->width * 2; au0828_analog_stream_enable(dev); au0828_analog_stream_reset(dev); @@ -1031,8 +1026,6 @@ static int au0828_v4l2_open(struct file *filp) &dev->lock); /* VBI Setup */ - dev->vbi_width = 720; - dev->vbi_height = 1; videobuf_queue_vmalloc_init(&fh->vb_vbiq, &au0828_vbi_qops, NULL, &dev->slock, V4L2_BUF_TYPE_VBI_CAPTURE, @@ -1984,6 +1977,8 @@ int au0828_analog_register(struct au0828_dev *dev, dev->field_size = dev->width * dev->height; dev->frame_size = dev->field_size << 1; dev->bytesperline = dev->width << 1; + dev->vbi_width = 720; + dev->vbi_height = 1; dev->ctrl_ainput = 0; dev->ctrl_freq = 960; dev->std = V4L2_STD_NTSC_M;