Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/broonie/spi into spi-fsl-dspi Conflicts: drivers/spi/spi-fsl-dspi.c
ambv · Apr 7, 2015 · 63031ed · 63031ed
2 parents 95bf15f + e689d6d
commit 63031ed
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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++) {