diff --git a/[refs] b/[refs] index 90823659d02c..7aecefd64be2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f684336bba673b6656cb98144130ab52dafc3240 +refs/heads/master: 99b55b2c4478e6370aaa85173f5090a070c50a08 diff --git a/trunk/drivers/media/dvb/mantis/mantis_ca.c b/trunk/drivers/media/dvb/mantis/mantis_ca.c index 177b04813ff0..53c01b3023cc 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_ca.c +++ b/trunk/drivers/media/dvb/mantis/mantis_ca.c @@ -156,6 +156,8 @@ int mantis_ca_init(struct mantis_pci *mantis) ca->en50221.poll_slot_status = mantis_slot_status; ca->en50221.data = ca; + mutex_init(&ca->ca_lock); + dprintk(verbose, MANTIS_ERROR, 1, "Registering EN50221 device"); if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) { dprintk(verbose, MANTIS_ERROR, 1, "EN50221: Initialization failed");