aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbylay Ospan <aospan@netup.ru>2010-05-12 04:24:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 01:19:43 -0300
commite4425eab6b2da050bae55cffa01e573767a819a1 (patch)
treed8f86390c8e54ff9c5244ad071d73827b3e96c40
parentd71964fb9731412ce1f86cd7d9b71f1f94a04b0d (diff)
downloadkernel_samsung_smdk4412-e4425eab6b2da050bae55cffa01e573767a819a1.zip
kernel_samsung_smdk4412-e4425eab6b2da050bae55cffa01e573767a819a1.tar.gz
kernel_samsung_smdk4412-e4425eab6b2da050bae55cffa01e573767a819a1.tar.bz2
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@redhat.com: move the return to the proper place] Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 9e14608..0a199d7 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) {