commit e685516d620349f07491c8a53e1410a85af17af7
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 21 01:10:50 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 21 01:10:45 2012 -0700
tree 4f393542fcba81b3a0832521ac2eb61e1e1c3607
parent b6994f5b0497b7643002b37b92b8c75c191f5fb9
parent e0589fc08cdc838874742306b412d9501a42bc9e

Merge "msm: clock-local2: Don't assume a branch's parent is a local RCG"

arch/arm/mach-msm/clock-local2.c

diff --git a/arch/arm/mach-msm/clock-local2.c b/arch/arm/mach-msm/clock-local2.c
index 3f19b2a..2beb990 100644
--- a/arch/arm/mach-msm/clock-local2.c
+++ b/arch/arm/mach-msm/clock-local2.c
@@ -474,10 +474,10 @@
 	if (branch->has_sibling == 1)
 		return -ENXIO;
 
-	if (branch->parent)
-		return rcg_clk_list_rate(branch->parent, n);
+	if (branch->parent && branch->parent->ops->list_rate)
+		return branch->parent->ops->list_rate(branch->parent, n);
 	else
-		return 0;
+		return -ENXIO;
 }
 
 static enum handoff branch_clk_handoff(struct clk *c)