Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
mfd
/
atmel-hlcdc.c
diff --git
a/kernel/drivers/mfd/atmel-hlcdc.c
b/kernel/drivers/mfd/atmel-hlcdc.c
index
06c2058
..
c216c3a
100644
(file)
--- a/
kernel/drivers/mfd/atmel-hlcdc.c
+++ b/
kernel/drivers/mfd/atmel-hlcdc.c
@@
-50,8
+50,9
@@
static int regmap_atmel_hlcdc_reg_write(void *context, unsigned int reg,
if (reg <= ATMEL_HLCDC_DIS) {
u32 status;
if (reg <= ATMEL_HLCDC_DIS) {
u32 status;
- readl_poll_timeout(hregmap->regs + ATMEL_HLCDC_SR, status,
- !(status & ATMEL_HLCDC_SIP), 1, 100);
+ readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR,
+ status, !(status & ATMEL_HLCDC_SIP),
+ 1, 100);
}
writel(val, hregmap->regs + reg);
}
writel(val, hregmap->regs + reg);