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

[pandora-kernel.git] / net / 9p / trans_rdma.c

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 3640e83..159c50f 100644 (file)
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -167,7 +167,6 @@ static int parse_opts(char *params, struct p9_rdma_opts *opts)
        substring_t args[MAX_OPT_ARGS];
        int option;
        char *options, *tmp_options;
        substring_t args[MAX_OPT_ARGS];
        int option;
        char *options, *tmp_options;

-       int ret;

 
        opts->port = P9_PORT;
        opts->sq_depth = P9_RDMA_SQ_DEPTH;
 
        opts->port = P9_PORT;
        opts->sq_depth = P9_RDMA_SQ_DEPTH;


@@ -195,7 +194,6 @@ static int parse_opts(char *params, struct p9_rdma_opts *opts)
                if (r < 0) {
                        P9_DPRINTK(P9_DEBUG_ERROR,
                                   "integer field, but no integer?\n");
                if (r < 0) {
                        P9_DPRINTK(P9_DEBUG_ERROR,
                                   "integer field, but no integer?\n");

-                       ret = r;

                        continue;
                }
                switch (token) {
                        continue;
                }
                switch (token) {