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
This commit is contained in:
Mark Brown 2015-04-07 11:54:40 +01:00
commit 63031ed6b8

View file

@ -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++) {