diff --git a/[refs] b/[refs] index b9e98ea818e9..3389ab050a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16ef3dfe460616f14120973f78fe640e79862654 +refs/heads/master: dfe96ddcfa22b44100814b9435770f6ff1309d37 diff --git a/trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c b/trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c index c0aa40f8ad6a..c27f59da7f29 100644 --- a/trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c +++ b/trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c @@ -57,17 +57,6 @@ static int fb_show(struct seq_file *m, void *arg) struct drm_device *dev = node->minor->dev; struct omap_drm_private *priv = dev->dev_private; struct drm_framebuffer *fb; - int ret; - - ret = mutex_lock_interruptible(&dev->mode_config.mutex); - if (ret) - return ret; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) { - mutex_unlock(&dev->mode_config.mutex); - return ret; - } seq_printf(m, "fbcon "); omap_framebuffer_describe(priv->fbdev->fb, m); @@ -82,9 +71,6 @@ static int fb_show(struct seq_file *m, void *arg) } mutex_unlock(&dev->mode_config.fb_lock); - mutex_unlock(&dev->struct_mutex); - mutex_unlock(&dev->mode_config.mutex); - return 0; }