drm/vmwgfx: Fix fence event code

The commit "vmwgfx: Rework fence event action" introduced a number of bugs
that are fixed with this commit:

a) A forgotten return stateemnt.
b) An if statement with identical branches.

Cc: <stable@vger.kernel.org>
Reported-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index 6773938b6e40..b7594cb758af 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -1087,6 +1087,8 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv,
         if (ret != 0)
                 goto out_no_queue;
 
+        return 0;
+
 out_no_queue:
         event->base.destroy(&event->base);
 out_no_event:
@@ -1162,17 +1164,10 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data,
 
         BUG_ON(fence == NULL);
 
-        if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME)
-                ret = vmw_event_fence_action_create(file_priv, fence,
-                                                    arg->flags,
-                                                    arg->user_data,
-                                                    true);
-        else
-                ret = vmw_event_fence_action_create(file_priv, fence,
-                                                    arg->flags,
-                                                    arg->user_data,
-                                                    true);
-
+        ret = vmw_event_fence_action_create(file_priv, fence,
+                                            arg->flags,
+                                            arg->user_data,
+                                            true);
         if (unlikely(ret != 0)) {
                 if (ret != -ERESTARTSYS)
                         DRM_ERROR("Failed to attach event to fence.\n");