From 001c7903a1d8839385e69aba31d45eeb0bf31f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Wed, 20 May 2009 13:32:00 +0200
Subject: [PATCH] --- yaml --- r: 145191 b: refs/heads/master c:
 9b6fe313bfce27d4a261257da70196be0ac2bef5 h: refs/heads/master i:   145189:
 5258563468ef782dc496c394e7ce96b914a6e55e   145187:
 6d0ba74d8e989970b4849c89757b2b739737b3d6   145183:
 ddf82b27dddaf4780b2bae178dc53d4550013bef v: v3

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

diff --git a/[refs] b/[refs]
index dc9a99f3b6c0..a463dd73e31d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b674137755bbe2750f997a2a1264db3cdf8abcb3
+refs/heads/master: 9b6fe313bfce27d4a261257da70196be0ac2bef5
diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c
index f01def16a669..019b7c578236 100644
--- a/trunk/drivers/gpu/drm/drm_drv.c
+++ b/trunk/drivers/gpu/drm/drm_drv.c
@@ -481,7 +481,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
 		}
 		retcode = func(dev, kdata, file_priv);
 
-		if ((retcode == 0) && (cmd & IOC_OUT)) {
+		if (cmd & IOC_OUT) {
 			if (copy_to_user((void __user *)arg, kdata,
 					 _IOC_SIZE(cmd)) != 0)
 				retcode = -EFAULT;