summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2008-06-03 11:27:39 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2008-06-03 11:27:39 +0200
commit6b520005c6714d8a8afa68b8a43065a40da298cc (patch)
treeec8689ea2dc1694c934b23afcb952ffc1af12939
parentd5ae19ebcf2dc6402872e0575b5786b6e8117b6f (diff)
Revert "don't copy back if an error was returned."
This reverts commit 6671ad1917698b6174a1af314b63b3800d75248c. The vblank ioctl needs to update the userspace parameters when interrupted by a signal, which was prevented by this. Let's see if this breaks other ioctls...
-rw-r--r--linux-core/drm_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index b8b8333e..609fc838 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -655,7 +655,7 @@ long drm_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
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 = -EACCES;