Commit f64db548 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

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: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarNishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20190929095848.21960-1-axel.lin@ingics.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a72865f0
...@@ -173,19 +173,14 @@ static int ti_abb_wait_txdone(struct device *dev, struct ti_abb *abb) ...@@ -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,
"%s:TRANXDONE timeout(%duS) int=0x%08x\n",
__func__, timeout, readl(abb->int_base)); __func__, timeout, readl(abb->int_base));
return -ETIMEDOUT; return -ETIMEDOUT;
}
return 0;
} }
/** /**
...@@ -205,19 +200,14 @@ static int ti_abb_clear_all_txdone(struct device *dev, const struct ti_abb *abb) ...@@ -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,
"%s:TRANXDONE timeout(%duS) int=0x%08x\n",
__func__, timeout, readl(abb->int_base)); __func__, timeout, readl(abb->int_base));
return -ETIMEDOUT; return -ETIMEDOUT;
}
return 0;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment