diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-03 20:08:07 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-14 00:10:14 +0100 |
| commit | b6a40e728099aa645d0d35896532e4f0f6f31e69 (patch) | |
| tree | 86cd9ebfe02ea294e6caeb60193645a02ca425d8 /drivers | |
| parent | [media] cx25840: fill the media controller entity (diff) | |
| download | linux-b6a40e728099aa645d0d35896532e4f0f6f31e69.tar.xz linux-b6a40e728099aa645d0d35896532e4f0f6f31e69.zip | |
[media] cx231xx: initialize video/vbi pads
Both video and vbi are sink pads. Initialize them as such.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-video.c | 13 | ||||
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index ecea76fe07f6..f3d1a488dfa7 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -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, diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index af9d6c4041dc..e0d3106f6b44 100644 --- a/drivers/media/usb/cx231xx/cx231xx.h +++ b/drivers/media/usb/cx231xx/cx231xx.h @@ -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]; |