diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-09 12:06:07 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-09 12:06:07 +0200 |
| commit | b8c511a4fbac3db36f26936d6cc710ca6df0a721 (patch) | |
| tree | acdd1bb883344e0ef06601b380604a7a07bf0129 /drivers/gpu/drm/sti/sti_tvout.c | |
| parent | 5c9f5549156737539a4b2a5b6d3e44b52c0f4e64 (diff) | |
| parent | 3c85f20a289d044f303f473ee6ab7502303fc3b0 (diff) | |
Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-nightly
Diffstat (limited to 'drivers/gpu/drm/sti/sti_tvout.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_tvout.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index f983db5a59da..60fe0afa5644 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -515,13 +515,7 @@ static int tvout_dbg_show(struct seq_file *s, void *data) { struct drm_info_node *node = s->private; struct sti_tvout *tvout = (struct sti_tvout *)node->info_ent->data; - struct drm_device *dev = node->minor->dev; struct drm_crtc *crtc; - int ret; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; seq_printf(s, "TVOUT: (vaddr = 0x%p)", tvout->regs); @@ -587,7 +581,6 @@ static int tvout_dbg_show(struct seq_file *s, void *data) DBGFS_DUMP(TVO_AUX_IN_VID_FORMAT); seq_puts(s, "\n"); - mutex_unlock(&dev->struct_mutex); return 0; } |