commit b39406f59e3aa020b7b8a53594ac079db77cfd7d
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 07 13:27:01 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 07 13:27:01 2013 -0800
tree ee74aa05c33d741f7adf66bcb6bac481067c7446
parent 572ca9cebebb19edfcdc44e2cdc340f8ff576257
parent ea6fab7e38a4011c0978de8b148836c97fbe5f2e

Merge "msm: msm_bus: Avoid touching ports owned by RPM"

arch/arm/mach-msm/msm_bus/msm_bus_bimc.c

diff --git a/arch/arm/mach-msm/msm_bus/msm_bus_bimc.c b/arch/arm/mach-msm/msm_bus/msm_bus_bimc.c
index d416c19..3c8348d 100644
--- a/arch/arm/mach-msm/msm_bus/msm_bus_bimc.c
+++ b/arch/arm/mach-msm/msm_bus/msm_bus_bimc.c
@@ -1960,7 +1960,8 @@
 	struct msm_bus_bimc_info *binfo =
 		(struct msm_bus_bimc_info *)hw_data;
 
-	if (!IS_SLAVE(info->node_info->priv_id))
+	if (!IS_SLAVE(info->node_info->priv_id) &&
+		(info->node_info->hw_sel != MSM_BUS_RPM))
 		msm_bus_bimc_mas_init(binfo, info);
 }