summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-07 11:54:40 +0100
committerMark Brown <broonie@kernel.org>2015-04-07 11:54:40 +0100
commit63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (patch)
tree34150d2e7ac4eb6c00f4bc96991947f71a338a0d /drivers/spi
parent95bf15f386417f3ba80bb860c1385b1ebfdcdffa (diff)
parente689d6df8257f92abf59e93736632b79c9b2aa66 (diff)
downloadlinux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.tar.bz2
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Conflicts: drivers/spi/spi-fsl-dspi.c
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-dspi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 4b6032dd0990..5fe54cda309f 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -155,6 +155,8 @@ static void hz_to_spi_baud(char *pbr, char *br, int speed_hz,
int i, j;
scale_needed = clkrate / speed_hz;
+ if (clkrate % speed_hz)
+ scale_needed++;
for (i = 0; i < ARRAY_SIZE(brs); i++)
for (j = 0; j < ARRAY_SIZE(pbr_tbl); j++) {