regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone
ti_abb_wait_txdone() may return -ETIMEDOUT when ti_abb_check_txdone() returns true in the latest iteration of the while loop because the timeout value is abb->settling_time + 1. Similarly, ti_abb_clear_all_txdone() may return -ETIMEDOUT when ti_abb_check_txdone() returns false in the latest iteration of the while loop. Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Nishanth Menon <nm@ti.com> Link: https://lore.kernel.org/r/20190929095848.21960-1-axel.lin@ingics.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
a72865f057
commit
f64db54879
@ -173,19 +173,14 @@ static int ti_abb_wait_txdone(struct device *dev, struct ti_abb *abb)
|
|||||||
while (timeout++ <= abb->settling_time) {
|
while (timeout++ <= abb->settling_time) {
|
||||||
status = ti_abb_check_txdone(abb);
|
status = ti_abb_check_txdone(abb);
|
||||||
if (status)
|
if (status)
|
||||||
break;
|
return 0;
|
||||||
|
|
||||||
udelay(1);
|
udelay(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeout > abb->settling_time) {
|
dev_warn_ratelimited(dev, "%s:TRANXDONE timeout(%duS) int=0x%08x\n",
|
||||||
dev_warn_ratelimited(dev,
|
__func__, timeout, readl(abb->int_base));
|
||||||
"%s:TRANXDONE timeout(%duS) int=0x%08x\n",
|
return -ETIMEDOUT;
|
||||||
__func__, timeout, readl(abb->int_base));
|
|
||||||
return -ETIMEDOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -205,19 +200,14 @@ static int ti_abb_clear_all_txdone(struct device *dev, const struct ti_abb *abb)
|
|||||||
|
|
||||||
status = ti_abb_check_txdone(abb);
|
status = ti_abb_check_txdone(abb);
|
||||||
if (!status)
|
if (!status)
|
||||||
break;
|
return 0;
|
||||||
|
|
||||||
udelay(1);
|
udelay(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeout > abb->settling_time) {
|
dev_warn_ratelimited(dev, "%s:TRANXDONE timeout(%duS) int=0x%08x\n",
|
||||||
dev_warn_ratelimited(dev,
|
__func__, timeout, readl(abb->int_base));
|
||||||
"%s:TRANXDONE timeout(%duS) int=0x%08x\n",
|
return -ETIMEDOUT;
|
||||||
__func__, timeout, readl(abb->int_base));
|
|
||||||
return -ETIMEDOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user