From e185a64e7942d905c88e4a9948f3e451fb228ce4 Mon Sep 17 00:00:00 2001 From: Jan Nikitenko Date: Mon, 7 Dec 2009 12:50:30 +0000 Subject: [PATCH] --- yaml --- r: 176181 b: refs/heads/master c: 04ba24b34ac8ea4885295a7f7f78f719bc8c859b h: refs/heads/master i: 176179: 81decfb9c94ac5a80547af4c9a84879001ad8663 v: v3 --- [refs] | 2 +- trunk/drivers/spi/au1550_spi.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2adb67c1b529..fa3384aea483 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3a08945166adc8515a8c7927fbf0df264db5b63 +refs/heads/master: 04ba24b34ac8ea4885295a7f7f78f719bc8c859b diff --git a/trunk/drivers/spi/au1550_spi.c b/trunk/drivers/spi/au1550_spi.c index 76cbc1a66598..cfd5ff9508fa 100644 --- a/trunk/drivers/spi/au1550_spi.c +++ b/trunk/drivers/spi/au1550_spi.c @@ -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",