diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-01 15:37:17 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-14 00:10:12 +0100 |
| commit | 1d058bdcf5cc800fbfeece0204f7774556d341bb (patch) | |
| tree | a98b9f562e24e927f66b0c768d39173a1e4d40d3 /drivers/media/usb/cx231xx/cx231xx.h | |
| parent | [media] dvbdev: add support for media controller (diff) | |
| download | linux-1d058bdcf5cc800fbfeece0204f7774556d341bb.tar.xz linux-1d058bdcf5cc800fbfeece0204f7774556d341bb.zip | |
[media] cx231xx: add media controller support
Let's add media controller support for this driver and register it
for both V4L and DVB.
The media controller on this driver is not mandatory, as it can fully
work without it. So, if the media controller register fails, just print
an error message, but proceed with device registering.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx.h')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index 6d6f3ee812f6..af9d6c4041dc 100644 --- a/drivers/media/usb/cx231xx/cx231xx.h +++ b/drivers/media/usb/cx231xx/cx231xx.h @@ -658,6 +658,10 @@ struct cx231xx { struct video_device *vbi_dev; struct video_device *radio_dev; +#if defined(CONFIG_MEDIA_CONTROLLER) + struct media_device *media_dev; +#endif + unsigned char eedata[256]; struct cx231xx_video_mode video_mode; |