From f0a86288fa4d7b951f33f7b1a6ef36106c7df788 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 11 Nov 2004 11:09:11 +0000 Subject: patch from bug 1803 - will try and push to kernel soon --- linux-core/i830_irq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'linux-core/i830_irq.c') 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__); -- cgit v1.2.3