diff options
author | Dave Airlie <airlied@linux.ie> | 2004-11-11 11:09:11 +0000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2004-11-11 11:09:11 +0000 |
commit | f0a86288fa4d7b951f33f7b1a6ef36106c7df788 (patch) | |
tree | 8707efa038d18e563a4e2e415e5ba9c5249f5925 /linux-core/i830_irq.c | |
parent | 4b4df875b26bd08ae62f26b8ced6a050425752ac (diff) |
patch from bug 1803 - will try and push to kernel soon
Diffstat (limited to 'linux-core/i830_irq.c')
-rw-r--r-- | linux-core/i830_irq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux-core/i830_irq.c b/linux-core/i830_irq.c index 586ceae2..4f592e48 100644 --- a/linux-core/i830_irq.c +++ b/linux-core/i830_irq.c @@ -124,10 +124,7 @@ int i830_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd, drm_i830_irq_emit_t emit; int result; - if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { - DRM_ERROR("i830_irq_emit called without lock held\n"); - return -EINVAL; - } + LOCK_TEST_WITH_RETURN(dev, filp); if (!dev_priv) { DRM_ERROR("%s called with no initialization\n", __FUNCTION__); |