Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / media / video / videobuf-dvb.c

diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index 3de7c7e4402de7f461c1eb4a41bde553f9062ada..59cb54aa2946e24cf29ae08846684d20c896642d 100644 (file)
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -226,9 +226,10 @@ static int videobuf_dvb_register_frontend(struct dvb_adapter *adapter,
        }
 
        /* register network adapter */
-       dvb_net_init(adapter, &dvb->net, &dvb->demux.dmx);
-       if (dvb->net.dvbdev == NULL) {
-               result = -ENOMEM;
+       result = dvb_net_init(adapter, &dvb->net, &dvb->demux.dmx);
+       if (result < 0) {
+               printk(KERN_WARNING "%s: dvb_net_init failed (errno = %d)\n",
+                      dvb->name, result);
                goto fail_fe_conn;
        }
        return 0;