diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-02 22:28:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-13 21:10:13 -0200 |
| commit | 8afd52ef92f8ff657965cef5f0da0a4bba04a361 (patch) | |
| tree | 8b459d329bff62fa1f93f0750fc48d7b8a8a088d /drivers/media/dvb-core | |
| parent | c1b31b1e8248a42e689000bf43e63ba8ee49f709 (diff) | |
| download | linux-stable-8afd52ef92f8ff657965cef5f0da0a4bba04a361.tar.gz linux-stable-8afd52ef92f8ff657965cef5f0da0a4bba04a361.tar.bz2 linux-stable-8afd52ef92f8ff657965cef5f0da0a4bba04a361.zip | |
[media] dmxdev: add support for demux/dvr nodes at media controller
Make the dvb core demux support aware of the media controller and
register the corresponding devices.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core')
| -rw-r--r-- | drivers/media/dvb-core/dmxdev.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index abff803ad69a..2835924955a4 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -1136,10 +1136,13 @@ static const struct file_operations dvb_demux_fops = { .llseek = default_llseek, }; -static struct dvb_device dvbdev_demux = { +static const struct dvb_device dvbdev_demux = { .priv = NULL, .users = 1, .writers = 1, +#if defined(CONFIG_MEDIA_CONTROLLER_DVB) + .name = "demux", +#endif .fops = &dvb_demux_fops }; @@ -1209,13 +1212,15 @@ static const struct file_operations dvb_dvr_fops = { .llseek = default_llseek, }; -static struct dvb_device dvbdev_dvr = { +static const struct dvb_device dvbdev_dvr = { .priv = NULL, .readers = 1, .users = 1, +#if defined(CONFIG_MEDIA_CONTROLLER_DVB) + .name = "dvr", +#endif .fops = &dvb_dvr_fops }; - int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) { int i; |