]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
mx6: clock: fix integer overflow in calculation of relative error in set_nfc_clk()
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 26 Apr 2016 13:20:19 +0000 (15:20 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 26 Apr 2016 13:20:19 +0000 (15:20 +0200)
arch/arm/cpu/armv7/mx6/clock.c

index 80f39690f65191bab0599cbf0d6a7ac9e56b51ac..9e76adc8089c2e68a86cb7966dfbf7e14fbc3a19 100644 (file)
@@ -677,7 +677,7 @@ static int set_nfc_clk(u32 ref, u32 freq_khz)
                podf = min(DIV_ROUND_UP(root_freq, freq), 1U << 6);
                pred = min(DIV_ROUND_UP(root_freq / podf, freq), 8U);
                act_freq = root_freq / pred / podf;
-               err = (freq - act_freq) * 100 / freq;
+               err = (freq - act_freq) / (freq / 1000);
                debug("root=%d[%u] freq=%u pred=%u podf=%u act=%u err=%d\n",
                        nfc_clk_sel, root_freq, freq, pred, podf, act_freq, err);
                if (act_freq > freq)
@@ -692,7 +692,7 @@ static int set_nfc_clk(u32 ref, u32 freq_khz)
                }
        }
 
-       if (nfc_val == ~0 || min_err > 10)
+       if (nfc_val == ~0 || min_err > 100)
                return -EINVAL;
 
        if ((cs2cdr & CS2CDR_ENFC_MASK) != nfc_val) {