These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / spi / spi-omap-uwire.c

diff --git a/kernel/drivers/spi/spi-omap-uwire.c b/kernel/drivers/spi/spi-omap-uwire.c
index 55576db..ce8dbdb 100644 (file)
--- a/kernel/drivers/spi/spi-omap-uwire.c
+++ b/kernel/drivers/spi/spi-omap-uwire.c
@@ -205,7 +205,7 @@ static void uwire_chipselect(struct spi_device *spi, int value)
 static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
 {
        unsigned        len = t->len;
-       unsigned        bits = t->bits_per_word ? : spi->bits_per_word;
+       unsigned        bits = t->bits_per_word;
        unsigned        bytes;
        u16             val, w;
        int             status = 0;
@@ -344,9 +344,10 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
        /* assume it's already enabled */
        rate = clk_get_rate(uwire->ck);
 
-       hz = spi->max_speed_hz;
-       if (t != NULL && t->speed_hz)
+       if (t != NULL)
                hz = t->speed_hz;
+       else
+               hz = spi->max_speed_hz;
 
        if (!hz) {
                pr_debug("%s: zero speed?\n", dev_name(&spi->dev));