diff --git a/[refs] b/[refs]
index 6e60a8b81b94..e68790d09c38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05259a6ffa40097b5565f25c3fcf833a9d3ecf5
+refs/heads/master: 9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec
diff --git a/trunk/drivers/clk/clk.c b/trunk/drivers/clk/clk.c
index 9a1eb0cfa95f..46317cbc088f 100644
--- a/trunk/drivers/clk/clk.c
+++ b/trunk/drivers/clk/clk.c
@@ -1235,8 +1235,8 @@ int __clk_init(struct device *dev, struct clk *clk)
 	 * If clk->parents is not NULL we skip this entire block.  This allows
 	 * for clock drivers to statically initialize clk->parents.
 	 */
-	if (clk->num_parents && !clk->parents) {
-		clk->parents = kmalloc((sizeof(struct clk*) * clk->num_parents),
+	if (clk->num_parents > 1 && !clk->parents) {
+		clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
 				GFP_KERNEL);
 		/*
 		 * __clk_lookup returns NULL for parents that have not been