Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / net / rds / tcp.c

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 5438f6725092b7962613f3cf0203e89f16735e34..a973d3b4dff0b2216bf3698cfbfeeb4b227dfc37 100644 (file)
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -652,16 +652,12 @@ static int rds_tcp_init(void)
        if (ret)
                goto out_pernet;
 
-       ret = rds_trans_register(&rds_tcp_transport);
-       if (ret)
-               goto out_recv;
+       rds_trans_register(&rds_tcp_transport);
 
        rds_info_register_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info);
 
        goto out;
 
-out_recv:
-       rds_tcp_recv_exit();
 out_pernet:
        unregister_pernet_subsys(&rds_tcp_net_ops);
 out_notifier: