[PATCH 3.16 026/294] drm/vmwgfx: Fix gcc-7.1.1 warning

[Ben Hutchings]

3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Sinclair Yeh 

commit fcfffdd8f98ac305285dca568b5065ef86be6458 upstream.

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.

Reported-by: Arnd Bergmann 
Reported-by: Linus Torvalds 
Signed-off-by: Sinclair Yeh 
Reviewed-by: Brian Paul 
Signed-off-by: Ben Hutchings 
---
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -285,7 +285,7 @@ static int vmw_cmd_invalid(struct vmw_pr
   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,

[PATCH 3.16 026/294] drm/vmwgfx: Fix gcc-7.1.1 warning

[Ben Hutchings]

3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Sinclair Yeh 

commit fcfffdd8f98ac305285dca568b5065ef86be6458 upstream.

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.

Reported-by: Arnd Bergmann 
Reported-by: Linus Torvalds 
Signed-off-by: Sinclair Yeh 
Reviewed-by: Brian Paul 
Signed-off-by: Ben Hutchings 
---
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -285,7 +285,7 @@ static int vmw_cmd_invalid(struct vmw_pr
   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,