projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-misc-fixes-2021-08-12' of git://anongit.freedesktop.org/drm/drm-misc...
[linux-2.6-microblaze.git]
/
drivers
/
dma
/
uniphier-xdmac.c
diff --git
a/drivers/dma/uniphier-xdmac.c
b/drivers/dma/uniphier-xdmac.c
index
16b1965
..
d6b8a20
100644
(file)
--- a/
drivers/dma/uniphier-xdmac.c
+++ b/
drivers/dma/uniphier-xdmac.c
@@
-209,8
+209,8
@@
static int uniphier_xdmac_chan_stop(struct uniphier_xdmac_chan *xc)
writel(0, xc->reg_ch_base + XDMAC_TSS);
/* wait until transfer is stopped */
writel(0, xc->reg_ch_base + XDMAC_TSS);
/* wait until transfer is stopped */
- return readl_poll_timeout(xc->reg_ch_base + XDMAC_STAT, val,
- !(val & XDMAC_STAT_TENF), 100, 1000);
+ return readl_poll_timeout
_atomic
(xc->reg_ch_base + XDMAC_STAT, val,
+
!(val & XDMAC_STAT_TENF), 100, 1000);
}
/* xc->vc.lock must be held by caller */
}
/* xc->vc.lock must be held by caller */