Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceea5e2d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] drx-j: use the proper timeout code on scu_command 



Checking if a time is after another one can have issues, as
times are generally u32 wide.

Use the proper macros for that at scu_command().

It should be noticed that other places also use jiffies
calculus on an improper way. This should be fixed too,
but the logic there is more complex. So, let's do it in
separate patches.

Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c4dc6f92

drivers/media/dvb-frontends/drx39xyj/drxj.c

+7 −5
Original line number Diff line number Diff line
@@ -4417,8 +4417,8 @@ ctrl_set_cfg_smart_ant(struct drx_demod_instance *demod, struct drxj_cfg_smart_a 
static int scu_command(struct i2c_device_addr *dev_addr, struct drxjscu_cmd *cmd)

{

	int rc;

	u32 start_time = 0;

	u16 cur_cmd = 0;

	unsigned long timeout;















	/* Check param */















	if (cmd == NULL)










@@ -4478,15 +4478,17 @@ static int scu_command(struct i2c_device_addr *dev_addr, struct drxjscu_cmd *cmd













	}





























	/* Wait until SCU has processed command */













	start_time = jiffies_to_msecs(jiffies);













	do {













	timeout = jiffies + msecs_to_jiffies(DRXJ_MAX_WAITTIME);













	while (time_is_after_jiffies(timeout)) {















		rc = DRXJ_DAP.read_reg16func(dev_addr, SCU_RAM_COMMAND__A, &cur_cmd, 0);















		if (rc != 0) {















			pr_err("error %d\n", rc);















			goto rw_error;















		}













	} while (!(cur_cmd == DRX_SCU_READY)













		 && ((jiffies_to_msecs(jiffies) - start_time) < DRXJ_MAX_WAITTIME));













		if (cur_cmd == DRX_SCU_READY)













			break;













		usleep_range(1000, 2000);













	}





























	if (cur_cmd != DRX_SCU_READY)















		return -EIO;