diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 16:22:04 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 16:22:04 +0000 |
commit | 6d211331e65b35a88b8577a1c0f4f054b5255ab1 (patch) | |
tree | 13b8a546145992e94115d1764cc93db32f1621be /linux/drm_lock.h | |
parent | db32792cc7e265397dfa780dedba7a620b74bae8 (diff) |
merged trunk into r200 branchr200-0-2-branch
Diffstat (limited to 'linux/drm_lock.h')
-rw-r--r-- | linux/drm_lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drm_lock.h b/linux/drm_lock.h index c10cfe2c..c887d1f6 100644 --- a/linux/drm_lock.h +++ b/linux/drm_lock.h @@ -237,7 +237,7 @@ int DRM(notifier)(void *priv) /* Allow signal delivery if lock isn't held */ - if (!_DRM_LOCK_IS_HELD(s->lock->lock) + if (!s->lock || !_DRM_LOCK_IS_HELD(s->lock->lock) || _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1; /* Otherwise, set flag to force call to |