]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blame - releases/4.12.5/drm-vmwgfx-fix-gcc-7.1.1-warning.patch
Linux 4.14.114
[thirdparty/kernel/stable-queue.git] / releases / 4.12.5 / drm-vmwgfx-fix-gcc-7.1.1-warning.patch
CommitLineData
37021d03
GKH
1From fcfffdd8f98ac305285dca568b5065ef86be6458 Mon Sep 17 00:00:00 2001
2From: Sinclair Yeh <syeh@vmware.com>
3Date: Mon, 17 Jul 2017 23:28:36 -0700
4Subject: drm/vmwgfx: Fix gcc-7.1.1 warning
5
6From: Sinclair Yeh <syeh@vmware.com>
7
8commit fcfffdd8f98ac305285dca568b5065ef86be6458 upstream.
9
10The current code does not look correct, and the reason for it is
11probably lost. Since this now generates a compiler warning,
12fix it to what makes sense.
13
14Reported-by: Arnd Bergmann <arnd@arndb.de>
15Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
16Signed-off-by: Sinclair Yeh <syeh@vmware.com>
17Reviewed-by: Brian Paul <brianp@vmware.com>
18Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19
20---
21 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
25+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
26@@ -519,7 +519,7 @@ static int vmw_cmd_invalid(struct vmw_pr
27 struct vmw_sw_context *sw_context,
28 SVGA3dCmdHeader *header)
29 {
30- return capable(CAP_SYS_ADMIN) ? : -EINVAL;
31+ return -EINVAL;
32 }
33
34 static int vmw_cmd_ok(struct vmw_private *dev_priv,