diff options
| author | Nicolas Ferre <nicolas.ferre@microchip.com> | 2019-04-03 12:23:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-11 12:23:57 +0200 |
| commit | 5cadb7ae715fa9c78f371a476f66570af0b5e4d1 (patch) | |
| tree | fa185be85321279b037d5d8b819122469e0be777 | |
| parent | af8b5d7d947730681bb44492c1a224f975c3541a (diff) | |
| download | linux-stable-5cadb7ae715fa9c78f371a476f66570af0b5e4d1.tar.gz linux-stable-5cadb7ae715fa9c78f371a476f66570af0b5e4d1.tar.bz2 linux-stable-5cadb7ae715fa9c78f371a476f66570af0b5e4d1.zip | |
dmaengine: at_xdmac: remove BUG_ON macro in tasklet
[ Upstream commit e2c114c06da2d9ffad5b16690abf008d6696f689 ]
Even if this case shouldn't happen when controller is properly programmed,
it's still better to avoid dumping a kernel Oops for this.
As the sequence may happen only for debugging purposes, log the error and
just finish the tasklet call.
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/dma/at_xdmac.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index af24c5bf32d6..8aa3ccf42e55 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -1608,7 +1608,11 @@ static void at_xdmac_tasklet(unsigned long data) struct at_xdmac_desc, xfer_node); dev_vdbg(chan2dev(&atchan->chan), "%s: desc 0x%p\n", __func__, desc); - BUG_ON(!desc->active_xfer); + if (!desc->active_xfer) { + dev_err(chan2dev(&atchan->chan), "Xfer not active: exiting"); + spin_unlock_bh(&atchan->lock); + return; + } txd = &desc->tx_dma_desc; |