aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-02 20:48:17 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-13 18:10:13 -0500
commit738a1b1e1355433ff29e20774df3d89355bbac9f (patch)
tree223386cee371b8ac643fe8d8e913b4d3175973d2 /drivers/media
parent8afd52ef92f8ff657965cef5f0da0a4bba04a361 (diff)
[media] dvb_ca_en50221: add support for CA node at the media controller
Make the dvb core CA 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')
-rw-r--r--drivers/media/dvb-core/dvb_ca_en50221.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 0aac3096728e..2bf28eb97a64 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1638,15 +1638,17 @@ static const struct file_operations dvb_ca_fops = {
1638 .llseek = noop_llseek, 1638 .llseek = noop_llseek,
1639}; 1639};
1640 1640
1641static struct dvb_device dvbdev_ca = { 1641static const struct dvb_device dvbdev_ca = {
1642 .priv = NULL, 1642 .priv = NULL,
1643 .users = 1, 1643 .users = 1,
1644 .readers = 1, 1644 .readers = 1,
1645 .writers = 1, 1645 .writers = 1,
1646#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
1647 .name = "ca_en50221",
1648#endif
1646 .fops = &dvb_ca_fops, 1649 .fops = &dvb_ca_fops,
1647}; 1650};
1648 1651
1649
1650/* ******************************************************************************** */ 1652/* ******************************************************************************** */
1651/* Initialisation/shutdown functions */ 1653/* Initialisation/shutdown functions */
1652 1654