diff --git a/[refs] b/[refs] index 59ef596197ad..27b81b71b226 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64760a4ee6e0d01c0019495a6513229259d86296 +refs/heads/master: 10bf573bc10f50f316764418c704309b02cd1246 diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c index 255658906fcf..7cb02f63b8e3 100644 --- a/trunk/drivers/gpu/drm/drm_crtc.c +++ b/trunk/drivers/gpu/drm/drm_crtc.c @@ -566,6 +566,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, if (!plane->format_types) { DRM_DEBUG_KMS("out of memory when allocating plane\n"); drm_mode_object_put(dev, &plane->base); + mutex_unlock(&dev->mode_config.mutex); return -ENOMEM; }