OMAPDSS: HDMI: fix missing unlock on error in hdmi_dump_regs()

Started by Wei Yongjun on Oct 21, 2012 · 3 messages from 3 authors · Last reply Oct 22, 2012

Subsystems (2)

Maintainers (2)

STALE5135d

open the first message on its own page

Wei Yongjun

Message details and related content
Open message details and related content
From: Wei Yongjun <redacted>

Add the missing unlock on the error handling path in function
hdmi_dump_regs().

Signed-off-by: Wei Yongjun <redacted>
---
no test
---
 drivers/video/omap2/dss/hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index a48a7dd..8c9b8b3 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -644,8 +644,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);

Sumit Semwal replied to Wei Yongjun

Message details and related content
Open message details and related content
On Sunday 21 October 2012 06:24 PM, Wei Yongjun wrote:
From: Wei Yongjun <redacted>

Add the missing unlock on the error handling path in function
hdmi_dump_regs().

Signed-off-by: Wei Yongjun <redacted>
Looks good to me; feel free to add:
Reviewed-by: Sumit Semwal <redacted>
quoted hunk
---
no test
---
  drivers/video/omap2/dss/hdmi.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index a48a7dd..8c9b8b3 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -644,8 +644,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);


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html





  

    

      
      Tomi Valkeinen      replied to Wei Yongjun      
      
    

  

  

    Message details and related content
    
Open message details and related content

  

  
On 2012-10-21 15:54, Wei Yongjun wrote:
quoted hunk
From: Wei Yongjun <redacted>

Add the missing unlock on the error handling path in function
hdmi_dump_regs().

Signed-off-by: Wei Yongjun <redacted>
---
no test
---
 drivers/video/omap2/dss/hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index a48a7dd..8c9b8b3 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -644,8 +644,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);
Thanks, applied to omapdss tree.

 Tomi









    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread / next series-diff position

          
kprevious message in thread / previous series-diff position

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help