Skip to content
Snippets Groups Projects
Commit 7363f2d4 authored by Vladimir Riabchun's avatar Vladimir Riabchun Committed by Andi Shyti
Browse files

i2c: pnx: Fix timeout in wait functions


Since commit f63b94be ("i2c: pnx: Fix potential deadlock warning
from del_timer_sync() call in isr") jiffies are stored in
i2c_pnx_algo_data.timeout, but wait_timeout and wait_reset are still
using it as milliseconds. Convert jiffies back to milliseconds to wait
for the expected amount of time.

Fixes: f63b94be ("i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr")
Signed-off-by: default avatarVladimir Riabchun <ferr.lambarginio@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent fac04efc
No related branches found
No related tags found
No related merge requests found
......@@ -95,7 +95,7 @@ enum {
static inline int wait_timeout(struct i2c_pnx_algo_data *data)
{
long timeout = data->timeout;
long timeout = jiffies_to_msecs(data->timeout);
while (timeout > 0 &&
(ioread32(I2C_REG_STS(data)) & mstatus_active)) {
mdelay(1);
......@@ -106,7 +106,7 @@ static inline int wait_timeout(struct i2c_pnx_algo_data *data)
static inline int wait_reset(struct i2c_pnx_algo_data *data)
{
long timeout = data->timeout;
long timeout = jiffies_to_msecs(data->timeout);
while (timeout > 0 &&
(ioread32(I2C_REG_CTL(data)) & mcntrl_reset)) {
mdelay(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment