redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] cx231xx: initialize video/vbi pads

Browse source 
Both video and vbi are sink pads. Initialize them as such.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-01-03 16:08:07 -03:00
parent 8cd61969c8
commit b6a40e7280
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/usb/cx231xx/cx231xx-video.c
View file

@ -2121,7 +2121,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
dev_err(dev->dev, "cannot allocate video_device.\n");
return -ENODEV;
}
#if defined(CONFIG_MEDIA_CONTROLLER)
dev->video_pad.flags = MEDIA_PAD_FL_SINK;
ret = media_entity_init(&dev->vdev->entity, 1, &dev->video_pad, 0);
if (ret < 0)
dev_err(dev->dev, "failed to initialize video media entity!\n");
#endif
dev->vdev->ctrl_handler = &dev->ctrl_handler;
/* register v4l2 video video_device */
ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
@ -2147,6 +2152,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
dev_err(dev->dev, "cannot allocate video_device.\n");
return -ENODEV;
}
#if defined(CONFIG_MEDIA_CONTROLLER)
dev->vbi_pad.flags = MEDIA_PAD_FL_SINK;
ret = media_entity_init(&dev->vbi_dev->entity, 1, &dev->vbi_pad, 0);
if (ret < 0)
dev_err(dev->dev, "failed to initialize vbi media entity!\n");
#endif
dev->vbi_dev->ctrl_handler = &dev->ctrl_handler;
/* register v4l2 vbi video_device */
ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,

1
drivers/media/usb/cx231xx/cx231xx.h
View file

@ -660,6 +660,7 @@ struct cx231xx {
#if defined(CONFIG_MEDIA_CONTROLLER)
struct media_device *media_dev;
struct media_pad video_pad, vbi_pad;
#endif
unsigned char eedata[256];