]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: mediatek: Fix a flag reuse error in mtk_cqdma_tx_status()
authorQiu-ji Chen <chenqiuji666@gmail.com>
Fri, 6 Jun 2025 09:00:17 +0000 (17:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Sep 2025 16:58:27 +0000 (18:58 +0200)
[ Upstream commit 8eba2187391e5ab49940cd02d6bd45a5617f4daf ]

Fixed a flag reuse bug in the mtk_cqdma_tx_status() function.

Fixes: 157ae5ffd76a ("dmaengine: mediatek: Fix a possible deadlock error in mtk_cqdma_tx_status()")
Cc: stable@vger.kernel.org
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505270641.MStzJUfU-lkp@intel.com/
Signed-off-by: Qiu-ji Chen <chenqiuji666@gmail.com>
Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20250606090017.5436-1-chenqiuji666@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/mediatek/mtk-cqdma.c

index e3c887148987bd38d6d84580453d148ba76f32bd..1bf4fc461a8ccd36c91bfca4812ba4410c1983a1 100644 (file)
@@ -449,9 +449,9 @@ static enum dma_status mtk_cqdma_tx_status(struct dma_chan *c,
                return ret;
 
        spin_lock_irqsave(&cvc->pc->lock, flags);
-       spin_lock_irqsave(&cvc->vc.lock, flags);
+       spin_lock(&cvc->vc.lock);
        vd = mtk_cqdma_find_active_desc(c, cookie);
-       spin_unlock_irqrestore(&cvc->vc.lock, flags);
+       spin_unlock(&cvc->vc.lock);
        spin_unlock_irqrestore(&cvc->pc->lock, flags);
 
        if (vd) {