mxc: vpu: improve clk enable/disable handling

diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c
index f0ea06e5658b7684c85b2e4247eb2010d8eaa298..44048d108e9356d68ec49c4edd34cd44ea04a0f8 100644 (file)
--- a/drivers/mxc/vpu/mxc_vpu.c
+++ b/drivers/mxc/vpu/mxc_vpu.c
@@ -138,20 +138,18 @@ static struct regulator *vpu_regulator;
 
 static int vpu_clk_enable(struct vpu_priv *vpu_data)
 {
 
 static int vpu_clk_enable(struct vpu_priv *vpu_data)
 {

-       int ret = 0;
+       if (WARN_ON(vpu_data->clk_enabled < 0))
+               return -EINVAL;

 
        if (vpu_data->clk_enabled++ == 0)
 
        if (vpu_data->clk_enabled++ == 0)

-               ret = clk_prepare_enable(vpu_clk);
-
-       if (WARN_ON(vpu_data->clk_enabled <= 0))
-               return -EINVAL;
+               return clk_prepare_enable(vpu_clk);

 
 

-       return ret;
+       return 0;

 }
 
 static int vpu_clk_disable(struct vpu_priv *vpu_data)
 {
 }
 
 static int vpu_clk_disable(struct vpu_priv *vpu_data)
 {

-       if (WARN_ON(vpu_data->clk_enabled == 0))
+       if (WARN_ON(vpu_data->clk_enabled <= 0))

                return -EINVAL;
 
        if (--vpu_data->clk_enabled == 0)
                return -EINVAL;
 
        if (--vpu_data->clk_enabled == 0)