evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: S3C2443: handle unset armdiv values gracefully

Browse source 
The armdiv array may contain unset divider values.
Check the relevant value to prevent division by zero
errors. Also check for set nr_armdiv and armdivmask
before meddling with clkdiv0.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Heiko Stuebner 2011-10-14 15:08:56 +09:00 • committed by Kukjin Kim
parent 5f33bd76f5
commit f9f7c7503f
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/arm/plat-s3c24xx/s3c2443-clock.c
View file

@ -179,11 +179,16 @@ static unsigned long s3c2443_armclk_roundrate(struct clk *clk,
unsigned div; unsigned div;
int ptr; int ptr;
if (!nr_armdiv)
return -EINVAL;
for (ptr = 0; ptr < nr_armdiv; ptr++) { for (ptr = 0; ptr < nr_armdiv; ptr++) {
div = armdiv[ptr]; div = armdiv[ptr];
calc = parent / div; if (div) {
if (calc <= rate && div < best) calc = parent / div;
best = div; if (calc <= rate && div < best)
best = div;
}
} }
return parent / best; return parent / best;
@ -195,6 +200,9 @@ static unsigned long s3c2443_armclk_getrate(struct clk *clk)
unsigned long clkcon0; unsigned long clkcon0;
int val; int val;
if (!nr_armdiv || !armdivmask)
return -EINVAL;
clkcon0 = __raw_readl(S3C2443_CLKDIV0); clkcon0 = __raw_readl(S3C2443_CLKDIV0);
clkcon0 &= armdivmask; clkcon0 &= armdivmask;
val = clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT; val = clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT;
@ -211,12 +219,17 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate)
int ptr; int ptr;
int val = -1; int val = -1;
if (!nr_armdiv || !armdivmask)
return -EINVAL;
for (ptr = 0; ptr < nr_armdiv; ptr++) { for (ptr = 0; ptr < nr_armdiv; ptr++) {
div = armdiv[ptr]; div = armdiv[ptr];
calc = parent / div; if (div) {
if (calc <= rate && div < best) { calc = parent / div;
best = div; if (calc <= rate && div < best) {
val = ptr; best = div;
val = ptr;
}
} }
} }