Merge branch 'topic/at' into for-linus (e1b5c26e) · Commits · 戴 / test

drivers/dma/at_xdmac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1600,7 +1600,7 @@ static void at_xdmac_tasklet(unsigned long data)
		if (atchan->status & AT_XDMAC_CIS_ROIS)
		dev_err(chan2dev(&atchan->chan), "request overflow error!!!");

		spin_lock_bh(&atchan->lock);
		spin_lock(&atchan->lock);
		desc = list_first_entry(&atchan->xfers_list,
		struct at_xdmac_desc,
		xfer_node);
		@@ -1610,7 +1610,7 @@ static void at_xdmac_tasklet(unsigned long data)
		txd = &desc->tx_dma_desc;

		at_xdmac_remove_xfer(atchan, desc);
		spin_unlock_bh(&atchan->lock);
		spin_unlock(&atchan->lock);

		if (!at_xdmac_chan_is_cyclic(atchan)) {
		dma_cookie_complete(txd);