| Message ID | 20200429075855.104487-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 18168291aa7dd48e9d9e3cbb1d4cd06e899357ca |
| Headers | show |
| Series | [-next] spi: uniphier: fix error return code in uniphier_spi_probe() | expand |
On Wed, 29 Apr 2020 07:58:55 +0000, Wei Yongjun wrote: > Fix to return negative error code -EPROBE_DEFER from the DMA probe defer > error handling case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/spi/spi-uniphier.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.8 Thanks! [1/1] spi: uniphier: fix error return code in uniphier_spi_probe() commit: 18168291aa7dd48e9d9e3cbb1d4cd06e899357ca All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 0fa50979644d..0457d3376873 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -716,8 +716,10 @@ static int uniphier_spi_probe(struct platform_device *pdev) master->dma_tx = dma_request_chan(&pdev->dev, "tx"); if (IS_ERR_OR_NULL(master->dma_tx)) { - if (PTR_ERR(master->dma_tx) == -EPROBE_DEFER) + if (PTR_ERR(master->dma_tx) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; goto out_disable_clk; + } master->dma_tx = NULL; dma_tx_burst = INT_MAX; } else { @@ -732,8 +734,10 @@ static int uniphier_spi_probe(struct platform_device *pdev) master->dma_rx = dma_request_chan(&pdev->dev, "rx"); if (IS_ERR_OR_NULL(master->dma_rx)) { - if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) + if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; goto out_disable_clk; + } master->dma_rx = NULL; dma_rx_burst = INT_MAX; } else {
Fix to return negative error code -EPROBE_DEFER from the DMA probe defer error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/spi/spi-uniphier.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)