Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[~andy/linux] / drivers / staging / lustre / lustre / obdecho / echo_client.c

diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index 1fb0ac4e920d58136163b7bd244fe782ecdc493a..9b2dea29236380ed8796cff1ffb1e8a2568cbfe4 100644 (file)
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1106,7 +1106,7 @@ static struct echo_object *cl_echo_object_find(struct echo_device *d,
        /* coverity[overrun-buffer-val] */
        obj = cl_object_find(env, echo_dev2cl(d), fid, &conf->eoc_cl);
        if (IS_ERR(obj))
-               GOTO(out, eco = (void*)obj);
+               GOTO(out, eco = (void *)obj);
 
        eco = cl2echo_obj(obj);
        if (eco->eo_deleted) {