diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-04-18 04:43:32 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-22 02:53:38 +0200 |
| commit | d816f6ac4f9877509baa3610be0d25b7afc29c00 (patch) | |
| tree | daa5c8dfe8b742163c6c6f05a598af1bd4dabe21 | |
| parent | drm/i915: add support for G41 chipset (diff) | |
| download | linux-d816f6ac4f9877509baa3610be0d25b7afc29c00.tar.xz linux-d816f6ac4f9877509baa3610be0d25b7afc29c00.zip | |
drm/i915: fix unpaired i915 device mutex on entervt failure.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4642115902d6..ee896d91c5bc 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, dev_priv->mm.suspended = 0; ret = i915_gem_init_ringbuffer(dev); - if (ret != 0) + if (ret != 0) { + mutex_unlock(&dev->struct_mutex); return ret; + } spin_lock(&dev_priv->mm.active_list_lock); BUG_ON(!list_empty(&dev_priv->mm.active_list)); |