diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:11:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:11:36 -0800 |
| commit | 43e407071d97c1a07a4601896581554a6b3bfd67 (patch) | |
| tree | 6f5bbf72bda0c983373a315d62dc229e591fca89 /drivers/gpu/drm/drm_lock.c | |
| parent | 155b25bcc28631a5b5230191aa3f56c40dfffa3f (diff) | |
| parent | 299eb93c5f651b2bc368ada67d8471e4c575fa21 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Fix use-before-null-check in i915_irq_emit().
drm: Avoid client deadlocks when the master disappears.
drm: Wake up all lock waiters when the master disappears.
drm: Don't return ERESTARTSYS to user-space.
Diffstat (limited to 'drivers/gpu/drm/drm_lock.c')
| -rw-r--r-- | drivers/gpu/drm/drm_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 46e7b28f0707..e2f70a516c34 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -80,6 +80,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) __set_current_state(TASK_INTERRUPTIBLE); if (!master->lock.hw_lock) { /* Device has been unregistered */ + send_sig(SIGTERM, current, 0); ret = -EINTR; break; } @@ -93,7 +94,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; } } |