Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[sfrench/cifs-2.6.git] / drivers / media / video / cx23885 / cx23885-dvb.c

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 9e1460828b2fb0410de226b7075d526402e13f8a..0a199d774d9b7473c37342f43d3629029d71c83b 100644 (file)
--- 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) {