]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spi: spi-mxs: Fix race in setup method
authorTrent Piepho <tpiepho@gmail.com>
Tue, 1 Oct 2013 20:15:25 +0000 (13:15 -0700)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 00:00:31 +0000 (01:00 +0100)
Despite many warnings in the SPI documentation and code, the spi-mxs
driver sets shared chip registers in the ->setup method.  This method can
be called when transfers are in progress on other slaves controlled by the
master.  Setting registers or any other shared state will corrupt those
transfers.

So fix mxs_spi_setup() to not call mxs_spi_setup_transfer().
mxs_spi_setup_transfer() is already called for each transfer when they
are actually performed in mxs_spi_transfer_one(), so the call in
mxs_spi_setup() isn't necessary to setup anything.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-mxs.c

index 8cb5d8b6f0420143c4efd4242e35383dcc73d041..e9cbdb6b1309c916078554a1c80e9d1b281d61a6 100644 (file)
@@ -103,21 +103,13 @@ static int mxs_spi_setup_transfer(struct spi_device *dev,
 
 static int mxs_spi_setup(struct spi_device *dev)
 {
-       int err = 0;
-
        if (!dev->bits_per_word)
                dev->bits_per_word = 8;
 
        if (dev->mode & ~(SPI_CPOL | SPI_CPHA))
                return -EINVAL;
 
-       err = mxs_spi_setup_transfer(dev, NULL);
-       if (err) {
-               dev_err(&dev->dev,
-                       "Failed to setup transfer, error = %d\n", err);
-       }
-
-       return err;
+       return 0;
 }
 
 static uint32_t mxs_spi_cs_to_reg(unsigned cs)