diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-09-15 16:26:14 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-16 20:53:04 +0100 |
commit | 88d4a7440e51754bd44f58fe1f8c6e6fe050e929 (patch) | |
tree | a31199afb6a4de00846d53e6d964623edec62b7b /drivers/spi | |
parent | 8ebe9d163e93e10458f3fd7522f29f9149e58632 (diff) | |
download | linux-88d4a7440e51754bd44f58fe1f8c6e6fe050e929.tar.gz linux-88d4a7440e51754bd44f58fe1f8c6e6fe050e929.tar.bz2 linux-88d4a7440e51754bd44f58fe1f8c6e6fe050e929.zip |
spi: s3c64xx: 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-s3c64xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index dee82e1ae65d..8e86e7f6663a 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -683,7 +683,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, /* Only BPW and Speed may change across transfers */ bpw = xfer->bits_per_word; - speed = xfer->speed_hz ? : spi->max_speed_hz; + speed = xfer->speed_hz; if (bpw != sdd->cur_bpw || speed != sdd->cur_speed) { sdd->cur_bpw = bpw; |