diff options
| author |   Serge Semin <Sergey.Semin@baikalelectronics.ru> | 2020-10-08 02:55:01 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-10-08 23:00:15 +0100 |
| commit | c6cb3815f70d39e377bec6b44d25f2d8b68b324e (patch) | |
| tree | 582c7329c8eacb04fb240dc641edc357295d3031 /drivers/spi | |
| parent | spi: dw: Unmask IRQs after enabling the chip (diff) | |
| download | linux-dev-c6cb3815f70d39e377bec6b44d25f2d8b68b324e.tar.xz linux-dev-c6cb3815f70d39e377bec6b44d25f2d8b68b324e.zip | |
spi: dw: Discard chip enabling on DMA setup error
It's pointless to enable the chip back if the DMA setup procedure fails,
since we'll disable it on the next transfer anyway. For the same reason We
don't do that in case of a failure detected in any other methods called
from the transfer_one() method.
While at it consider any non-zero value returned from the dma_setup
callback to be erroneous as it's supposed to be in the kernel.
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Link: https://lore.kernel.org/r/20201007235511.4935-13-Sergey.Semin@baikalelectronics.ru
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-dw-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c index 89e5428c8de6..ac87ff6d8be4 100644 --- a/drivers/spi/spi-dw-core.c +++ b/drivers/spi/spi-dw-core.c @@ -372,10 +372,8 @@ static int dw_spi_transfer_one(struct spi_controller *master, if (dws->dma_mapped) { ret = dws->dma_ops->dma_setup(dws, transfer); - if (ret < 0) { - spi_enable_chip(dws, 1); + if (ret) return ret; - } } spi_enable_chip(dws, 1); |