From 2bba60824fd6f146e38cd2978fa9b8a8238762f5 Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Thu, 19 Apr 2012 13:49:00 -0500 Subject: [PATCH] siihdmi: correct bus timeouts to convert ms to jiffies for the time_after function --- drivers/video/mxc/siihdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/mxc/siihdmi.c b/drivers/video/mxc/siihdmi.c index ed58978d29c..f8bb0be6404 100644 --- a/drivers/video/mxc/siihdmi.c +++ b/drivers/video/mxc/siihdmi.c @@ -1068,7 +1068,7 @@ static int siihdmi_detect_monitor(struct siihdmi_tx *tx) ctrl = i2c_smbus_read_byte_data(tx->client, SIIHDMI_TPI_REG_SYS_CTRL); } while ((~ctrl & SIIHDMI_SYS_CTRL_DDC_BUS_GRANTED) && - !time_after(jiffies, start + bus_timeout)); + !time_after(jiffies, start + msecs_to_jiffies(bus_timeout))); if (~ctrl & SIIHDMI_SYS_CTRL_DDC_BUS_GRANTED) goto relinquish; @@ -1159,7 +1159,7 @@ relinquish: ctrl = i2c_smbus_read_byte_data(tx->client, SIIHDMI_TPI_REG_SYS_CTRL); } while ((ctrl & SIIHDMI_SYS_CTRL_DDC_BUS_GRANTED) && - !time_after(jiffies, start + bus_timeout)); + !time_after(jiffies, start + msecs_to_jiffies(bus_timeout))); /* now, force the operational mode (HDMI or DVI) based on sink * type and make it stick with a power up request (pg 27)