X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fclk%2Fclk.c;h=3e10cdff284b8522a80ab436e8795cd0233fd855;hp=42064cec236409b1e4af817d2d6de22287438a89;hb=b61c43c09f5e2b9bf8f340034c5ef1db8c64efa5;hpb=dfc202ead3123988793ac1160849676000b77ee4

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 42064cec2364..3e10cdff284b 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2055,16 +2055,18 @@ static int clk_core_set_parent(struct clk_core *clk, struct clk_core *parent)
 	if (!clk)
 		return 0;
 
-	/* verify ops for for multi-parent clks */
-	if ((clk->num_parents > 1) && (!clk->ops->set_parent))
-		return -ENOSYS;
-
 	/* prevent racing with updates to the clock topology */
 	clk_prepare_lock();
 
 	if (clk->parent == parent)
 		goto out;
 
+	/* verify ops for for multi-parent clks */
+	if ((clk->num_parents > 1) && (!clk->ops->set_parent)) {
+		ret = -ENOSYS;
+		goto out;
+	}
+
 	/* check that we are allowed to re-parent if the clock is in use */
 	if ((clk->flags & CLK_SET_PARENT_GATE) && clk->prepare_count) {
 		ret = -EBUSY;