Commit 7363f2d4 authored Dec 07, 2024 by Vladimir Riabchun Committed by Andi Shyti Dec 10, 2024

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: Vladimir Riabchun <ferr.lambarginio@gmail.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

parent fac04efc

drivers/i2c/busses/i2c-pnx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);