UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/at' into for-linus

This commit is contained in:
Vinod Koul 2018-10-24 09:15:32 +01:00
parent 27d8d2d7a9 d8570d018f
commit e1b5c26e25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/at_xdmac.c
View File

@ -1600,7 +1600,7 @@ static void at_xdmac_tasklet(unsigned long data)
if (atchan->status & AT_XDMAC_CIS_ROIS) if (atchan->status & AT_XDMAC_CIS_ROIS)
dev_err(chan2dev(&atchan->chan), "request overflow error!!!"); dev_err(chan2dev(&atchan->chan), "request overflow error!!!");
spin_lock_bh(&atchan->lock); spin_lock(&atchan->lock);
desc = list_first_entry(&atchan->xfers_list, desc = list_first_entry(&atchan->xfers_list,
struct at_xdmac_desc, struct at_xdmac_desc,
xfer_node); xfer_node);
@ -1610,7 +1610,7 @@ static void at_xdmac_tasklet(unsigned long data)
txd = &desc->tx_dma_desc; txd = &desc->tx_dma_desc;
at_xdmac_remove_xfer(atchan, desc); at_xdmac_remove_xfer(atchan, desc);
spin_unlock_bh(&atchan->lock); spin_unlock(&atchan->lock);
if (!at_xdmac_chan_is_cyclic(atchan)) { if (!at_xdmac_chan_is_cyclic(atchan)) {
dma_cookie_complete(txd); dma_cookie_complete(txd);