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

Commit 04ba24b3 authored by Jan Nikitenko's avatar Jan Nikitenko Committed by Grant Likely
Browse files

spi/au1550_spi: fix setupxfer not to override cfg with zeros 



fix setupxfer() not to override generic configuration of speed_hz
and bits_per_word with zeros

Signed-off-by: default avatarJan Nikitenko <jan.nikitenko@gmail.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent b3a08945

drivers/spi/au1550_spi.c

+8 −2
Original line number Diff line number Diff line
@@ -237,8 +237,14 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t) 
	unsigned bpw, hz;

	u32 cfg, stat;



	bpw = t ? t->bits_per_word : spi->bits_per_word;

	hz = t ? t->speed_hz : spi->max_speed_hz;

	bpw = spi->bits_per_word;

	hz = spi->max_speed_hz;

	if (t) {

		if (t->bits_per_word)

			bpw = t->bits_per_word;

		if (t->speed_hz)

			hz = t->speed_hz;

	}



	if (bpw < 4 || bpw > 24) {

		dev_err(&spi->dev, "setupxfer: invalid bits_per_word=%d\n",