On 02/13/2015 11:57 PM, Mauro Carvalho Chehab wrote: > Make the dvb core CA support aware of the media controller and > register the corresponding devices. > > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> > > 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 = { > .llseek = noop_llseek, > }; > > -static struct dvb_device dvbdev_ca = { > +static const struct dvb_device dvbdev_ca = { > .priv = NULL, > .users = 1, > .readers = 1, > .writers = 1, > +#if defined(CONFIG_MEDIA_CONTROLLER_DVB) > + .name = "ca_en50221", I'd use 'dvb-ca-en50221': the dvb prefix makes it clear that this is a dvb core device, and personally I prefer '-' over '_'. Regards, Hans > +#endif > .fops = &dvb_ca_fops, > }; > > - > /* ******************************************************************************** */ > /* Initialisation/shutdown functions */ > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html