Abylai Ospan wrote: > Mauro, > > Please pull follwing fix: > > http://udev.netup.ru/cgi-bin/hgwebdir.cgi/v4l-dvb-aospan-ci_init-fix > > "Fix kernel Oops when number of NetUP Dual DVB-S2-CI cards more than DVB_MAX_ADAPTERS limit" > > Thanks. > The fix seems ok, but it is at the wrong place: if DVB bus fails, it makes no sense on keep running any post-register initialization, like calling netup_get_card_info() and copying the mac address. The better is to return the fail. So, I moved the return to the proper place. See bellow. Cheers, Mauro --- commit 94096e78ed500d424153da0ecbc69273753f2ee3 Author: Abylay Ospan <aospan@xxxxxxxx> Date: Wed May 12 04:24:09 2010 -0300 V4L/DVB: cx23885: Check register errors Fix kernel Oops when number of NetUP Dual DVB-S2-CI cards more than DVB_MAX_ADAPTERS limit. [mchehab@xxxxxxxxxx: move the return to the proper place] Signed-off-by: Abylay Ospan <aospan@xxxxxxxx> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 939079d..1ed058f 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c @@ -991,6 +991,8 @@ static int dvb_register(struct cx23885_tsport *port) ret = videobuf_dvb_register_bus(&port->frontends, THIS_MODULE, port, &dev->pci->dev, adapter_nr, 0, cx23885_dvb_fe_ioctl_override); + if (!ret) + return ret; /* init CI & MAC */ switch (dev->board) { -- 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
