renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

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

Browse Source 
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: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-01-26 15:55:57 -03:00
parent c4dc6f9222
commit ceea5e2d9d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/dvb-frontends/drx39xyj/drxj.c
View File

@ -4417,8 +4417,8 @@ rw_error:
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;