From 518685b35217d40482744ed058f29f0d3c8560fc Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 5 Nov 2012 11:11:50 +0200 Subject: [PATCH] --- yaml --- r: 344609 b: refs/heads/master c: 9296dbd79efb3a754f06d71510cc47af7eff0bee h: refs/heads/master i: 344607: 8b5cb89ef19e665a66f5706e94522b686f649d0b v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/hdmi.c | 4 +++- trunk/include/video/omapdss.h | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f32c20ec72a4..e2f766605eb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc81fc5f3f6070820cb7ef885daa37545291e97 +refs/heads/master: 9296dbd79efb3a754f06d71510cc47af7eff0bee diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index 03440e6c3f1b..2aada9db0a04 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -668,8 +668,10 @@ static void hdmi_dump_regs(struct seq_file *s) { mutex_lock(&hdmi.lock); - if (hdmi_runtime_get()) + if (hdmi_runtime_get()) { + mutex_unlock(&hdmi.lock); return; + } hdmi.ip_data.ops->dump_wrapper(&hdmi.ip_data, s); hdmi.ip_data.ops->dump_pll(&hdmi.ip_data, s); diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h index bf2c68ad1995..b1248c2d36e1 100644 --- a/trunk/include/video/omapdss.h +++ b/trunk/include/video/omapdss.h @@ -620,10 +620,6 @@ struct omap_dss_device { struct { struct omap_video_timings timings; - int acbi; /* ac-bias pin transitions per interrupt */ - /* Unit: line clocks */ - int acb; /* ac-bias pin frequency */ - enum omap_dss_dsi_pixel_format dsi_pix_fmt; enum omap_dss_dsi_mode dsi_mode; struct omap_dss_dsi_videomode_timings dsi_vm_timings;