From c1567bbfcc8dc5a3e3a2c88290e2cb88abdc7b17 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 31 Dec 2011 07:54:16 -0300
Subject: [PATCH] --- yaml --- r: 285728 b: refs/heads/master c:
 58fae6739f63344d255161900ba12ce7ceb88666 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/dvb/dvb-core/dvb_net.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d8e83c7a8a14..703d57217057 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed3189cf989128fe283d6dbffbbae08b67d9e5bd
+refs/heads/master: 58fae6739f63344d255161900ba12ce7ceb88666
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_net.c b/trunk/drivers/media/dvb/dvb-core/dvb_net.c
index 93d9869e0f15..8766ce8c354d 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_net.c
@@ -1510,9 +1510,7 @@ int dvb_net_init (struct dvb_adapter *adap, struct dvb_net *dvbnet,
 	for (i=0; i<DVB_NET_DEVICES_MAX; i++)
 		dvbnet->state[i] = 0;
 
-	dvb_register_device (adap, &dvbnet->dvbdev, &dvbdev_net,
+	return dvb_register_device(adap, &dvbnet->dvbdev, &dvbdev_net,
 			     dvbnet, DVB_DEVICE_NET);
-
-	return 0;
 }
 EXPORT_SYMBOL(dvb_net_init);