diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2020-01-07 12:52:53 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-02-24 15:24:52 +0100 |
| commit | 05e2ebfa2bb02d40857b1b6718d91135ee2cd7f5 (patch) | |
| tree | 12fa3c5e7a01e1ea0343158f431204eb4ff4ff1c /drivers/media/platform/stm32/stm32-dcmi.c | |
| parent | af5b333a793a93da3b2fbe887681fd32f8095645 (diff) | |
| download | linux-stable-05e2ebfa2bb02d40857b1b6718d91135ee2cd7f5.tar.gz linux-stable-05e2ebfa2bb02d40857b1b6718d91135ee2cd7f5.tar.bz2 linux-stable-05e2ebfa2bb02d40857b1b6718d91135ee2cd7f5.zip | |
media: stm32-dcmi: Use dma_request_chan() instead dma_request_slave_channel()
dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.
By using dma_request_chan() directly the driver can support deferred
probing against DMA.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform/stm32/stm32-dcmi.c')
| -rw-r--r-- | drivers/media/platform/stm32/stm32-dcmi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 9392e3409fba..b63ff8d636ce 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -1910,10 +1910,13 @@ static int dcmi_probe(struct platform_device *pdev) return PTR_ERR(mclk); } - chan = dma_request_slave_channel(&pdev->dev, "tx"); - if (!chan) { - dev_info(&pdev->dev, "Unable to request DMA channel, defer probing\n"); - return -EPROBE_DEFER; + chan = dma_request_chan(&pdev->dev, "tx"); + if (IS_ERR(chan)) { + ret = PTR_ERR(chan); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "Failed to request DMA channel: %d\n", ret); + return ret; } spin_lock_init(&dcmi->irqlock); |