Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[mirror_ubuntu-artful-kernel.git] / net / rds / rdma_transport.c

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index d5f3117671575f84550c4bee7b4aef7753bd9f59..fc59821f0a27bd2a529c17a36c5b06a1d5d91a8e 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -206,18 +206,13 @@ static int rds_rdma_init(void)
 {
        int ret;
 
-       ret = rds_rdma_listen_init();
+       ret = rds_ib_init();
        if (ret)
                goto out;
 
-       ret = rds_ib_init();
+       ret = rds_rdma_listen_init();
        if (ret)
-               goto err_ib_init;
-
-       goto out;
-
-err_ib_init:
-       rds_rdma_listen_stop();
+               rds_ib_exit();
 out:
        return ret;
 }