Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[platform/kernel/linux-exynos.git] / drivers / gpu / ipu-v3 / ipu-di.c

diff --git a/drivers/gpu/ipu-v3/ipu-di.c b/drivers/gpu/ipu-v3/ipu-di.c
index 3ddfb3d..2970c6b 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-di.c
+++ b/drivers/gpu/ipu-v3/ipu-di.c
@@ -441,8 +441,7 @@ static void ipu_di_config_clock(struct ipu_di *di,
 
                        in_rate = clk_get_rate(clk);
                        div = DIV_ROUND_CLOSEST(in_rate, sig->mode.pixelclock);
-                       if (div == 0)
-                               div = 1;
+                       div = clamp(div, 1U, 255U);
 
                        clkgen0 = div << 4;
                }
@@ -459,8 +458,7 @@ static void ipu_di_config_clock(struct ipu_di *di,
 
                clkrate = clk_get_rate(di->clk_ipu);
                div = DIV_ROUND_CLOSEST(clkrate, sig->mode.pixelclock);
-               if (div == 0)
-                       div = 1;
+               div = clamp(div, 1U, 255U);
                rate = clkrate / div;
 
                error = rate / (sig->mode.pixelclock / 1000);
@@ -483,8 +481,7 @@ static void ipu_di_config_clock(struct ipu_di *di,
 
                        in_rate = clk_get_rate(clk);
                        div = DIV_ROUND_CLOSEST(in_rate, sig->mode.pixelclock);
-                       if (div == 0)
-                               div = 1;
+                       div = clamp(div, 1U, 255U);
 
                        clkgen0 = div << 4;
                }