From: Vladimir Zapolskiy Date: Wed, 30 Sep 2015 23:23:36 +0000 (+0300) Subject: mtd: nand: lpc32xx_slc: fix potential overflow over 4 bits X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=08d3cd5ef0633df84d119e939d8d1b56c6e4a5e7;p=deliverable%2Flinux.git mtd: nand: lpc32xx_slc: fix potential overflow over 4 bits In case if quotient of controller clock rate to device clock rate does not fit into 4 bit value, choose the maximum acceptable value 0xF, which stands for 16 clocks. Signed-off-by: Vladimir Zapolskiy Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index 9ac0f3b5554c..a9e8a02cdac5 100644 --- a/drivers/mtd/nand/lpc32xx_slc.c +++ b/drivers/mtd/nand/lpc32xx_slc.c @@ -95,7 +95,7 @@ * slc_tac register definitions **********************************************************************/ /* Computation of clock cycles on basis of controller and device clock rates */ -#define SLCTAC_CLOCKS(c, n, s) (((1 + (c / n)) & 0xF) << s) +#define SLCTAC_CLOCKS(c, n, s) (min_t(u32, 1 + (c / n), 0xF) << s) /* Clock setting for RDY write sample wait time in 2*n clocks */ #define SLCTAC_WDR(n) (((n) & 0xF) << 28)