summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2011-11-01 11:11:35 +0200
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:52 -0800
commit879ebaf76014f9c92df5cdf158910d6b860ce060 (patch)
treef2ec10f49a2c5ffe1ca8b66de7a5e1fcc5edbfcf /drivers/video/tegra/host
parentf52488034b6e1c1dd7a110dca1d9b89a9fbb6cd8 (diff)
tegra: video: host: Add context to timeout structure
Add hwctx pointer to timeout structure. This makes sure the correct hardware context is cleared. Bug 886411 Change-Id: Ia5541add0b9af5bbc2f1264d33bcdc549bc99650 Reviewed-on: http://git-master/r/61449 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> (cherry picked from commit 7e2fb5bb2985373e869079ee7c628c1694216f21) Reviewed-on: http://git-master/r/62358 Tested-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com> Rebase-Id: Rf5b8d8d00442ec20726bbdc3337abbc4aa54f8fc
Diffstat (limited to 'drivers/video/tegra/host')
-rw-r--r--drivers/video/tegra/host/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index 27afee6326f7..be22f04feba8 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -130,6 +130,7 @@ static int nvhost_channelopen(struct inode *inode, struct file *filp)
if (!priv->hwctx)
goto fail;
priv->hwctx->timeout = &priv->timeout;
+ priv->timeout.hwctx = priv->hwctx;
}
priv->priority = NVHOST_PRIORITY_MEDIUM;