aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2009-03-02 11:10:54 +0100
committerDave Airlie <airlied@linux.ie>2009-03-03 09:49:46 +1000
commit4d77c88e912e5eb9480432af09e950ca8995c253 (patch)
tree7e11cab663107a7beb0fa25e79bb33baa2c6de90 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
downloadlinux-dev-4d77c88e912e5eb9480432af09e950ca8995c253.tar.xz
linux-dev-4d77c88e912e5eb9480432af09e950ca8995c253.zip
drm: Don't return ERESTARTSYS to user-space.
That return code is for in-kernel use only. Use EINTR instead. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 46e7b28f0707..b03586fdabbd 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -93,7 +93,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
/* Contention */
schedule();
if (signal_pending(current)) {
- ret = -ERESTARTSYS;
+ ret = -EINTR;
break;
}
}