提交 b6a40e72 编写于 作者: M Mauro Carvalho Chehab

[media] cx231xx: initialize video/vbi pads

Both video and vbi are sink pads. Initialize them as such.
Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
上级 8cd61969
...@@ -2121,7 +2121,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) ...@@ -2121,7 +2121,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
dev_err(dev->dev, "cannot allocate video_device.\n"); dev_err(dev->dev, "cannot allocate video_device.\n");
return -ENODEV; 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; dev->vdev->ctrl_handler = &dev->ctrl_handler;
/* register v4l2 video video_device */ /* register v4l2 video video_device */
ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER, ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
...@@ -2147,6 +2152,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) ...@@ -2147,6 +2152,12 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
dev_err(dev->dev, "cannot allocate video_device.\n"); dev_err(dev->dev, "cannot allocate video_device.\n");
return -ENODEV; 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; dev->vbi_dev->ctrl_handler = &dev->ctrl_handler;
/* register v4l2 vbi video_device */ /* register v4l2 vbi video_device */
ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
......
...@@ -660,6 +660,7 @@ struct cx231xx { ...@@ -660,6 +660,7 @@ struct cx231xx {
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
struct media_device *media_dev; struct media_device *media_dev;
struct media_pad video_pad, vbi_pad;
#endif #endif
unsigned char eedata[256]; unsigned char eedata[256];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册