From de4f846712e677071373fde4432c6f1e2263064e Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 31 Dec 2011 07:56:11 -0300
Subject: [PATCH] --- yaml --- r: 285729 b: refs/heads/master c:
 5c96ebb7cea790c6ca1b8b70fdea531fb194dabb h: refs/heads/master i:   285727:
 e946561cacac2791f519a59454dff9960ab4d960 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/videobuf-dvb.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 703d57217057..e2ebab497784 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58fae6739f63344d255161900ba12ce7ceb88666
+refs/heads/master: 5c96ebb7cea790c6ca1b8b70fdea531fb194dabb
diff --git a/trunk/drivers/media/video/videobuf-dvb.c b/trunk/drivers/media/video/videobuf-dvb.c
index 3de7c7e4402d..59cb54aa2946 100644
--- a/trunk/drivers/media/video/videobuf-dvb.c
+++ b/trunk/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;