diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2020-05-27 10:06:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-29 11:19:49 +0300 |
| commit | 1e21d43f1c3be8cc0a8b149ee843441536e5f3d3 (patch) | |
| tree | 48ac070a6406fbd940bce3593e23bcf3e6187328 | |
| parent | e3601dc0ac7f598df5e15643a82e88b769301510 (diff) | |
| download | linux-1e21d43f1c3be8cc0a8b149ee843441536e5f3d3.tar.xz | |
dmaengine: ti: k3-udma: Fix the running channel handling in alloc_chan_resources
[ Upstream commit b5b0180c2f767e90b4a6a885a0a2abaab6e3d48d ]
In the unlikely case when the channel is running (RT enabled) during
alloc_chan_resources then we should use udma_reset_chan() and not
udma_stop() as the later is trying to initiate a teardown on the channel,
which is not valid at this point.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200527070612.636-3-peter.ujfalusi@ti.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/dma/ti/k3-udma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 35f54a1af29d..b777f1924968 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1868,7 +1868,7 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_stop(uc); + udma_reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); goto err_res_free; |