]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
spi: dw: Discard chip enabling on DMA setup error
authorSerge Semin <Sergey.Semin@baikalelectronics.ru>
Wed, 7 Oct 2020 23:55:01 +0000 (02:55 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 8 Oct 2020 22:00:15 +0000 (23:00 +0100)
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>
drivers/spi/spi-dw-core.c

index 89e5428c8de672df26bcd9db259bdda7ba170738..ac87ff6d8be4eaa337a95443cb96f2897a1b6100 100644 (file)
@@ -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);