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

Commit 26cc44f8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/core' into spi-linus

parents 6a13feb9 abeedb01

drivers/spi/spi.c

+2 −2
Original line number Diff line number Diff line
@@ -1992,11 +1992,11 @@ int spi_setup(struct spi_device *spi) 
	if (!spi->max_speed_hz)

		spi->max_speed_hz = spi->master->max_speed_hz;



	spi_set_cs(spi, false);



	if (spi->master->setup)

		status = spi->master->setup(spi);



	spi_set_cs(spi, false);



	dev_dbg(&spi->dev, "setup mode %d, %s%s%s%s%u bits/w, %u Hz max --> %d\n",

			(int) (spi->mode & (SPI_CPOL | SPI_CPHA)),

			(spi->mode & SPI_CS_HIGH) ? "cs_high, " : "",