diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
commit | 77827a7cf3aa415f8afec6d9d0537dda8de90ef1 (patch) | |
tree | 503ab81e2b997e3625360b380f1cd18f923a6454 /drivers/gpu/drm/i915/i915_irq.c | |
parent | 9d40bbda599def1e1d155d7f7dca14fe8744bd2b (diff) | |
parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 548ff2c6643..87b6b603469 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -383,12 +383,13 @@ int i915_irq_emit(struct drm_device *dev, void *data, drm_i915_irq_emit_t *emit = data; int result; - RING_LOCK_TEST_WITH_RETURN(dev, file_priv); - if (!dev_priv) { DRM_ERROR("called with no initialization\n"); return -EINVAL; } + + RING_LOCK_TEST_WITH_RETURN(dev, file_priv); + mutex_lock(&dev->struct_mutex); result = i915_emit_irq(dev); mutex_unlock(&dev->struct_mutex); |