Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63031ed6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/fsl-dspi' of... 

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
parents 95bf15f3 e689d6df

drivers/spi/spi-fsl-dspi.c

+2 −0
Original line number Diff line number Diff line
@@ -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++) {