spi_s3c24xx: fix transfer setup code

Since the changes to the bitbang driver, there is the possibility we will
be called with either the speed_hz or bpw values zero.  We take these to
mean that the default values (8 bits per word, or maximum bus speed).

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ben Dooks 2009-08-18 14:11:17 -07:00 коммит произвёл Linus Torvalds
Родитель b897878454
Коммит 1915297566
1 изменённых файлов: 6 добавлений и 0 удалений

Просмотреть файл

@ -116,6 +116,12 @@ static int s3c24xx_spi_setupxfer(struct spi_device *spi,
bpw = t ? t->bits_per_word : spi->bits_per_word; bpw = t ? t->bits_per_word : spi->bits_per_word;
hz = t ? t->speed_hz : spi->max_speed_hz; hz = t ? t->speed_hz : spi->max_speed_hz;
if (!bpw)
bpw = 8;
if (!hz)
hz = spi->max_speed_hz;
if (bpw != 8) { if (bpw != 8) {
dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw); dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
return -EINVAL; return -EINVAL;