adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Jan Nikitenko <jan.nikitenko@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Jan Nikitenko 2009-12-07 12:50:30 +00:00 committed by Grant Likely
parent b3a0894516
commit 04ba24b34a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/spi/au1550_spi.c
View file

@ -237,8 +237,14 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
unsigned bpw, hz; unsigned bpw, hz;
u32 cfg, stat; u32 cfg, stat;
bpw = t ? t->bits_per_word : spi->bits_per_word; bpw = spi->bits_per_word;
hz = t ? t->speed_hz : spi->max_speed_hz; 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) { if (bpw < 4 || bpw > 24) {
dev_err(&spi->dev, "setupxfer: invalid bits_per_word=%d\n", dev_err(&spi->dev, "setupxfer: invalid bits_per_word=%d\n",