diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:46:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:46:28 +0100 |
| commit | 94b086b243e112030b815b76e61de6523e6fc700 (patch) | |
| tree | 3c7f2308e7e5afdb276a858c4960754168a92d8c /fs/nfs/callback.c | |
| parent | drivers/base: remove CONFIG_EXPERIMENTAL (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-94b086b243e112030b815b76e61de6523e6fc700.tar.xz linux-94b086b243e112030b815b76e61de6523e6fc700.zip | |
Merge 3.7-rc3 into driver-core-next
This pulls in the various driver core changes that were in 3.7-rc3 into the
driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs/callback.c')
| -rw-r--r-- | fs/nfs/callback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 9a521fb39869..5088b57b078a 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -241,7 +241,7 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, svc_exit_thread(cb_info->rqst); cb_info->rqst = NULL; cb_info->task = NULL; - return PTR_ERR(cb_info->task); + return ret; } dprintk("nfs_callback_up: service started\n"); return 0; |