]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
i915: fix lock imbalance on error path...
authorDaniel J Blueman <daniel.blueman@gmail.com>
Mon, 17 May 2010 13:23:52 +0000 (14:23 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:20:48 +0000 (10:20 -0700)
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

index 7f436ec075f6221df8ee6beafebae603054be003..544923988d138e1d55dfa25be708b85ae3fdf4be 100644 (file)
@@ -192,6 +192,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;
        }