From 31b8c317a043a6d1047016681ef57eaa3886e92e Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu, 30 Sep 2010 12:18:33 +0200
Subject: [PATCH] --- yaml --- r: 211211 b: refs/heads/master c:
 2854eedae2ff35d95e8923bebdb942bbd537c54f h: refs/heads/master i:   211209:
 a820c4d0d41806e63262711aa358c33bd90d65f7   211207:
 7719823f48ee01a84011cfa9f90e17eb5c9060c1 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d3c5e0fd896..4c7edeac7029 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39b4d07aa3583ceefe73622841303a0a3e942ca1
+refs/heads/master: 2854eedae2ff35d95e8923bebdb942bbd537c54f
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 72ec2e2b6e97..292aeba385e0 100644
--- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -500,7 +500,7 @@ static long vmw_unlocked_ioctl(struct file *filp, unsigned int cmd,
 		struct drm_ioctl_desc *ioctl =
 		    &vmw_ioctls[nr - DRM_COMMAND_BASE];
 
-		if (unlikely(ioctl->cmd != cmd)) {
+		if (unlikely(ioctl->cmd_drv != cmd)) {
 			DRM_ERROR("Invalid command format, ioctl %d\n",
 				  nr - DRM_COMMAND_BASE);
 			return -EINVAL;