summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2015-09-15 15:26:13 +0200
committerMark Brown <broonie@kernel.org>2015-09-16 21:52:52 +0200
commitfc306de9b54e94a2949fee452741c00259d7dd4a (patch)
treef91b5b773c8d72926339f05155623a126104eae6 /drivers/spi
parentLinux 4.3-rc1 (diff)
downloadlinux-fc306de9b54e94a2949fee452741c00259d7dd4a.tar.xz
linux-fc306de9b54e94a2949fee452741c00259d7dd4a.zip
spi: txx9: Use transfer speed unconditionally
SPI core validates the transfer speed and defaults to spi->max_speed_hz in case the transfer speed is not set. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-txx9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 9190124b6d90..d69f8f8f3fa6 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -181,7 +181,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
u32 data;
unsigned int len = t->len;
unsigned int wsize;
- u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
+ u32 speed_hz = t->speed_hz;
u8 bits_per_word = t->bits_per_word;
wsize = bits_per_word >> 3; /* in bytes */