diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-11-08 18:26:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 18:26:20 -0300 |
| commit | ad4c64e47c85a8e6d16ab61aa45d4bd4b645228d (patch) | |
| tree | 29ea6fbe4dacfd49723f265950c186fbca9736ca /drivers/spi | |
| parent | 90064bcbaaf162090c50cd136687159ace347a90 (diff) | |
| parent | 32fa65b1d7d22ef7a185a3c89283c89aa532d83b (diff) | |
Merge pull request #167 from zandrey/5.4-2.1.x-imx
Update 5.4-2.1.x-imx to v5.4.75 from stable
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sprd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c index fa597e27be17..e60aff990395 100644 --- a/drivers/spi/spi-sprd.c +++ b/drivers/spi/spi-sprd.c @@ -563,11 +563,11 @@ static int sprd_spi_dma_request(struct sprd_spi *ss) ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn"); if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) { + dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]); if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER) return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]); dev_err(ss->dev, "request TX DMA channel failed!\n"); - dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]); return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]); } |