UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (9230): cx23885: MFE related OOPS fix 

Bug: the tree generated an oops when the cx23885 was laoded. This avoids
the oops by ensuring the mutex is correctly initialised before it's used.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2008-10-11 12:25:25 -03:00 committed by Mauro Carvalho Chehab
parent 63248f2664
commit d782ffa24f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx23885/cx23885-core.c
View File

@ -643,6 +643,10 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
port->mpegq.timeout.data = (unsigned long)port;
init_timer(&port->mpegq.timeout);
mutex_init(&port->frontends.lock);
INIT_LIST_HEAD(&port->frontends.frontend.felist);
port->frontends.active_fe_id = 0;
switch(portno) {
case 1:
port->reg_gpcnt = VID_B_GPCNT;

5
drivers/media/video/cx23885/cx23885-dvb.c
View File

@ -314,11 +314,6 @@ static int dvb_register(struct cx23885_tsport *port)
struct cx23885_i2c *i2c_bus = NULL;
struct videobuf_dvb_frontend *fe0;
/* FIXME: add support for multi-frontend */
mutex_init(&port->frontends.lock);
INIT_LIST_HEAD(&port->frontends.frontend.felist);
port->frontends.active_fe_id = 0;
printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
if (videobuf_dvb_alloc_frontend(dev, &port->frontends, 1) == NULL) {