|
@@ -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)
|
|
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,
|