]> git.karo-electronics.de Git - mv-sheeva.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)
committerEric Anholt <eric@anholt.net>
Wed, 26 May 2010 20:50:11 +0000 (13:50 -0700)
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>
drivers/gpu/drm/i915/i915_drv.c

index d40f62d3645374e1fb06fffdd6f1b4026934911a..c072b212979cbad92f4c0b399ab5e7f4577a4bf4 100644 (file)
@@ -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;
        }