diff --git a/[refs] b/[refs] index 88f349f85b99..75d0144043ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c5d37033b3a16fdf6442730cee82dd3e8465fb1 +refs/heads/master: 80d9b24a658c83602aea66e45e2347c5bb3cbd47 diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index d4a1d8b06336..28e1c35aec6f 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -1070,6 +1070,8 @@ vmw_execbuf_copy_fence_user(struct vmw_private *dev_priv, if (user_fence_rep == NULL) return; + memset(&fence_rep, 0, sizeof(fence_rep)); + fence_rep.error = ret; if (ret == 0) { BUG_ON(fence == NULL);