From 717ba3521ce18a9c26f4385c76b9da6d871ead06 Mon Sep 17 00:00:00 2001
From: Tony Prisk <linux@prisktech.co.nz>
Date: Thu, 27 Dec 2012 13:14:31 +1300
Subject: [PATCH] --- yaml --- r: 350727 b: refs/heads/master c:
 58eb5a6763deab71208fbff15b09055fac884b11 h: refs/heads/master i:   350725:
 bc3850b9aec859053fca5da4eb08b4798daddac6   350723:
 732ca9863d5cfc3b0e850cdc26924609b76b248b   350719:
 15e90ca390e15325fc635f9e13a513ddf7bbb290 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/clk/clk-vt8500.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a541b629a5db..64f1f808e641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72480014b86c8b51fb51c5c6a0525876055c37c7
+refs/heads/master: 58eb5a6763deab71208fbff15b09055fac884b11
diff --git a/trunk/drivers/clk/clk-vt8500.c b/trunk/drivers/clk/clk-vt8500.c
index 3306c2b1906c..db7d41f25046 100644
--- a/trunk/drivers/clk/clk-vt8500.c
+++ b/trunk/drivers/clk/clk-vt8500.c
@@ -121,7 +121,12 @@ static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
 				unsigned long *prate)
 {
 	struct clk_device *cdev = to_clk_device(hw);
-	u32 divisor = *prate / rate;
+	u32 divisor;
+
+	if (rate == 0)
+		return 0;
+
+	divisor = *prate / rate;
 
 	/* If prate / rate would be decimal, incr the divisor */
 	if (rate * divisor < *prate)
@@ -142,9 +147,14 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
 				unsigned long parent_rate)
 {
 	struct clk_device *cdev = to_clk_device(hw);
-	u32 divisor = parent_rate / rate;
+	u32 divisor;
 	unsigned long flags = 0;
 
+	if (rate == 0)
+		return 0;
+
+	divisor =  parent_rate / rate;
+
 	/* If prate / rate would be decimal, incr the divisor */
 	if (rate * divisor < *prate)
 		divisor++;