summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2012-05-29 07:51:49 +0300
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-05-31 08:14:36 -0700
commit7051a98f335b7326cab052eed93c11bfcacf5d24 (patch)
treebe0be76845e5a712e41b85ec83410679ae6dd687 /drivers/video/tegra/host
parent3e8b5c5460b795c3e50f8221c7ee12858264ae76 (diff)
video: tegra: host: Use correct units in default timeout
Convert the jiffies to msecs when assigning a channel the default timeout. Change-Id: If9b6fb7c695e9621a0c50d99d4d1362b6dd214b6 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/105022 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host')
-rw-r--r--drivers/video/tegra/host/bus_client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/bus_client.c b/drivers/video/tegra/host/bus_client.c
index 12e0a043aec8..962de32f359f 100644
--- a/drivers/video/tegra/host/bus_client.c
+++ b/drivers/video/tegra/host/bus_client.c
@@ -140,7 +140,9 @@ static int nvhost_channelopen(struct inode *inode, struct file *filp)
priv->priority = NVHOST_PRIORITY_MEDIUM;
priv->clientid = atomic_add_return(1,
&nvhost_get_host(ch->dev)->clientid);
- priv->timeout = MAX_STUCK_CHECK_COUNT * SYNCPT_CHECK_PERIOD;
+ priv->timeout =
+ jiffies_to_msecs(MAX_STUCK_CHECK_COUNT * SYNCPT_CHECK_PERIOD);
+
return 0;
fail:
nvhost_channelrelease(inode, filp);