commit 68fad51535167bb81066aa45eeea6b710d8b34ea
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 19 04:42:40 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 19 04:42:33 2012 -0700
tree 308218bfcf122131decd7c074095170212a84369
parent 1a6e6d7bfdff583e20d6f11c864359aa38d3811d
parent ff92804047a2e3f7d75f7fc661779a93f9bc2c24

Merge "msm: vidc: Reduce video core clock for encoding"

drivers/media/video/msm_vidc/msm_vidc_common.c

diff --git a/drivers/media/video/msm_vidc/msm_vidc_common.c b/drivers/media/video/msm_vidc/msm_vidc_common.c
index 5b83cfb..7b48b0d 100644
--- a/drivers/media/video/msm_vidc/msm_vidc_common.c
+++ b/drivers/media/video/msm_vidc/msm_vidc_common.c
@@ -737,7 +737,7 @@
 		dprintk(VIDC_ERR, "Invalid args: %p\n", core);
 		return -EINVAL;
 	}
-	num_mbs_per_sec = 2 * msm_comm_get_load(core, MSM_VIDC_ENCODER);
+	num_mbs_per_sec = msm_comm_get_load(core, MSM_VIDC_ENCODER);
 	num_mbs_per_sec += msm_comm_get_load(core, MSM_VIDC_DECODER);
 	dprintk(VIDC_INFO, "num_mbs_per_sec = %d\n", num_mbs_per_sec);
 	rc = clk_set_rate(core->resources.clock[VCODEC_CLK].clk,