summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel J Blueman <daniel.blueman@gmail.com>2010-05-17 14:23:52 +0100
committerEric Anholt <eric@anholt.net>2010-05-26 13:50:11 -0700
commitf953c9353f5fe6e98fa7f32f51060a74d845b5f8 (patch)
tree3109f56f2cb384f646ae7e34b5d40ccc775818d6
parentf41275e893191eeb7a88e431d594e167adbd5234 (diff)
downloadblackbird-op-linux-f953c9353f5fe6e98fa7f32f51060a74d845b5f8.tar.gz
blackbird-op-linux-f953c9353f5fe6e98fa7f32f51060a74d845b5f8.zip
i915: fix lock imbalance on error path...
While investigating Intel i5 Arrandale GPU lockups with -rc4, I noticed a lock imbalance. Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index d40f62d36453..c072b212979c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -370,6 +370,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
}
} else {
DRM_ERROR("Error occurred. Don't know how to reset this chip.\n");
+ mutex_unlock(&dev->struct_mutex);
return -ENODEV;
}
OpenPOWER on IntegriCloud