aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88/cx88-cards.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-09-20 12:23:44 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 10:32:36 (GMT)
commitccd6f1d488e7e49ca90d4255cb3f8a2f61951e55 (patch)
tree7bca7160649dd812de9579ad383c66e694e76774 /drivers/media/pci/cx88/cx88-cards.c
parentd386259f8ee95d260ecb99aad3afc434819491ec (diff)
[media] cx88: move width, height and field to core struct
The width, height and field values are core fields since both vbi, video and blackbird use the same video input. Move those fields to the correct struct. Also fix the field checks in the try_fmt functions: add V4L2_FIELD_SEQ_BT/TB support and map incorrect field values to a correct field value instead of returning an error. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx88/cx88-cards.c')
-rw-r--r--drivers/media/pci/cx88/cx88-cards.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index 851754b..6db6549 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -3691,6 +3691,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
core->nr = nr;
sprintf(core->name, "cx88[%d]", core->nr);
+ core->tvnorm = V4L2_STD_NTSC_M;
+ core->width = 320;
+ core->height = 240;
+ core->field = V4L2_FIELD_INTERLACED;
+
strcpy(core->v4l2_dev.name, core->name);
if (v4l2_device_register(NULL, &core->v4l2_dev)) {
kfree(core);

Privacy Policy