Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-txx9.c

diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 9190124b6d9095c653b8f51ac92e915ade8c2e22..d69f8f8f3fa698d1eb34c744ea25e0058035ad82 100644 (file)
--- 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 */