github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

spi: Merge up fixes

Browse Source 
Help the CI by merging up fixes into the development branch.
This commit is contained in:
Mark Brown 2026-05-19 09:44:41 +01:00
commit 58c7f6a2c3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-ep93xx.c
View File

@ -582,12 +582,14 @@ static int ep93xx_spi_setup_dma(struct device *dev, struct ep93xx_spi *espi)
espi->dma_rx = dma_request_chan(dev, "rx");
if (IS_ERR(espi->dma_rx)) {
ret = dev_err_probe(dev, PTR_ERR(espi->dma_rx), "rx DMA setup failed");
espi->dma_rx = NULL;
goto fail_free_page;
}
espi->dma_tx = dma_request_chan(dev, "tx");
if (IS_ERR(espi->dma_tx)) {
ret = dev_err_probe(dev, PTR_ERR(espi->dma_tx), "tx DMA setup failed");
espi->dma_tx = NULL;
goto fail_release_rx;
}

2
drivers/spi/spi-mtk-snfi.c
View File

@ -961,7 +961,7 @@ static int mtk_snand_read_page_cache(struct mtk_snand *snf,
&snf->op_done, usecs_to_jiffies(SNFI_POLL_INTERVAL))) {
dev_err(snf->dev, "DMA timed out for reading from cache.\n");
ret = -ETIMEDOUT;
goto cleanup;
goto cleanup2;
}
// Wait for BUS_SEC_CNTR returning expected value

3
drivers/spi/spi-qup.c
View File

@ -996,8 +996,11 @@ static int spi_qup_init_dma(struct spi_controller *host, resource_size_t base)
err:
dma_release_channel(host->dma_tx);
host->dma_tx = NULL;
err_tx:
dma_release_channel(host->dma_rx);
host->dma_rx = NULL;
return ret;
}

3
drivers/spi/spi-sprd.c
View File

@ -989,7 +989,8 @@ static int sprd_spi_probe(struct platform_device *pdev)
disable_clk:
clk_disable_unprepare(ss->clk);
release_dma:
sprd_spi_dma_release(ss);
if (ss->dma.enable)
sprd_spi_dma_release(ss);
return ret;
}

1
drivers/spi/spi-ti-qspi.c
View File

@ -860,6 +860,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
dev_err(qspi->dev,
"dma_alloc_coherent failed, using PIO mode\n");
dma_release_channel(qspi->rx_chan);
qspi->rx_chan = NULL;
goto no_dma;
}
host->dma_rx = qspi->rx_chan;