Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit d782ffa24fc6ce01b3308a0bec5aa5d9d666b568

Authored by Steven Toth
Committed by Mauro Carvalho Chehab
1 parent 63248f2664
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

drivers/media/video/cx23885/cx23885-core.c
Diff comments   View file @ d782ffa
... ... @@ -643,6 +643,10 @@
643 643 port->mpegq.timeout.data = (unsigned long)port;
644 644 init_timer(&port->mpegq.timeout);
645 645  
  646 + mutex_init(&port->frontends.lock);
  647 + INIT_LIST_HEAD(&port->frontends.frontend.felist);
  648 + port->frontends.active_fe_id = 0;
  649 +
646 650 switch(portno) {
647 651 case 1:
648 652 port->reg_gpcnt = VID_B_GPCNT;
drivers/media/video/cx23885/cx23885-dvb.c
Diff comments   View file @ d782ffa
... ... @@ -314,11 +314,6 @@
314 314 struct cx23885_i2c *i2c_bus = NULL;
315 315 struct videobuf_dvb_frontend *fe0;
316 316  
317   - /* FIXME: add support for multi-frontend */
318   - mutex_init(&port->frontends.lock);
319   - INIT_LIST_HEAD(&port->frontends.frontend.felist);
320   - port->frontends.active_fe_id = 0;
321   -
322 317 printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
323 318  
324 319 if (videobuf_dvb_alloc_frontend(dev, &port->frontends, 1) == NULL) {