commit 03721bd992a5a27a903c6eea69b22cacc20443f0
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 21 14:12:17 2011 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri Oct 21 14:12:17 2011 -0700
tree dce79ca98c1177aa84573c200f526cfe3893a6c3
parent 93696bf559834f3b0c3db2422eb39ddf9e54e632
parent 5283716d21af697a88ce5ec20fc2bba7a19a6272

Merge "msm: vidc: 7x30: Fix device argument of clk_get() for mem_clk" into msm-3.0

drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c

diff --git a/drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c b/drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
index 54d48b8..7ac32b7 100644
--- a/drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
+++ b/drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
@@ -407,7 +407,7 @@
 {
 	VCDRES_MSG_MED("\n res_trk_power_up():: "
 		"Calling AXI add requirement\n");
-	ebi1_clk = clk_get(NULL, "mem_clk");
+	ebi1_clk = clk_get(resource_context.device, "mem_clk");
 	if (IS_ERR(ebi1_clk)) {
 		VCDRES_MSG_ERROR("Request AXI bus QOS fails.");
 		return false;