__spi_validate() in the generic SPI code sets ->speed_hz and
->bits_per_word to non-zero values, so this condition is always true.

Signed-off-by: Rasmus Villemoes <rasmus.villem...@prevas.dk>
---
This of course relies on no spi_message reaching
->transfer_one_message without having been through __spi_validate. I
believe that's ok.

 drivers/spi/spi-fsl-spi.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 3d7b50c65f36..6d114daa178a 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -384,12 +384,10 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
        cs_change = 1;
        status = -EINVAL;
        list_for_each_entry(t, &m->transfers, transfer_list) {
-               if (t->bits_per_word || t->speed_hz) {
-                       if (cs_change)
-                               status = fsl_spi_setup_transfer(spi, t);
-                       if (status < 0)
-                               break;
-               }
+               if (cs_change)
+                       status = fsl_spi_setup_transfer(spi, t);
+               if (status < 0)
+                       break;
 
                if (cs_change) {
                        fsl_spi_chipselect(spi, BITBANG_CS_ACTIVE);
-- 
2.20.1

Reply via email to