| From f953c9353f5fe6e98fa7f32f51060a74d845b5f8 Mon Sep 17 00:00:00 2001 |
| From: Daniel J Blueman <daniel.blueman@gmail.com> |
| Date: Mon, 17 May 2010 14:23:52 +0100 |
| Subject: i915: fix lock imbalance on error path... |
| |
| From: Daniel J Blueman <daniel.blueman@gmail.com> |
| |
| commit f953c9353f5fe6e98fa7f32f51060a74d845b5f8 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/i915/i915_drv.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/gpu/drm/i915/i915_drv.c |
| +++ b/drivers/gpu/drm/i915/i915_drv.c |
| @@ -328,6 +328,7 @@ int i965_reset(struct drm_device *dev, u |
| } |
| } else { |
| DRM_ERROR("Error occurred. Don't know how to reset this chip.\n"); |
| + mutex_unlock(&dev->struct_mutex); |
| return -ENODEV; |
| } |
| |
