From: Sinclair Yeh <syeh@vmware.com>
Date: Tue, 18 Jul 2017 06:28:36 +0000 (-0700)
Subject: drm/vmwgfx: Fix gcc-7.1.1 warning
X-Git-Tag: v4.13-rc3~18^2~5^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fcfffdd8f98ac305285dca568b5065ef86be6458;p=karo-tx-linux.git

drm/vmwgfx: Fix gcc-7.1.1 warning

The current code does not look correct, and the reason for it is
probably lost.  Since this now generates a compiler warning,
fix it to what makes sense.

Cc: <stable@vger.kernel.org>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index c8faf1ac5333..2cfb3c93f42a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -519,7 +519,7 @@ static int vmw_cmd_invalid(struct vmw_private *dev_priv,
 			   struct vmw_sw_context *sw_context,
 			   SVGA3dCmdHeader *header)
 {
-	return capable(CAP_SYS_ADMIN) ? : -EINVAL;
+	return -EINVAL;
 }
 
 static int vmw_cmd_ok(struct vmw_private *dev_priv,