diff --git a/[refs] b/[refs] index 49fee6de9d45..5d0e11f26f1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 143f412eb4c7cc48b9eb4381f9133b7d36c68075 +refs/heads/master: 712917d1c002f820b177683f4fd491289bde3c32 diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c index d2f0550c4ba0..d78479782045 100644 --- a/trunk/net/sunrpc/clnt.c +++ b/trunk/net/sunrpc/clnt.c @@ -113,7 +113,7 @@ rpc_new_client(struct rpc_xprt *xprt, char *servname, err = -EINVAL; if (!xprt) - goto out_err; + goto out_no_xprt; if (vers >= program->nrvers || !(version = program->version[vers])) goto out_err; @@ -182,6 +182,7 @@ rpc_new_client(struct rpc_xprt *xprt, char *servname, kfree(clnt); out_err: xprt_destroy(xprt); +out_no_xprt: return ERR_PTR(err); }