diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-10 10:01:59 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-10 10:01:59 +0530 |
| commit | 7adb08046b793f52749e2c54be2f7434196c32cf (patch) | |
| tree | 300e8e2e5270708d1b23a438bba9844bacb58d54 /drivers/video/tegra/host/nvhost_channel.c | |
| parent | 845c6e1d456c92e32ad79176d418c0d2592998d4 (diff) | |
| parent | 42907f1736fe39cdf39b5f583fcd6b9e4e257b18 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I1312ec33ba8bac38dc395d7d1a2f485b13d74c14
Diffstat (limited to 'drivers/video/tegra/host/nvhost_channel.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_channel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/tegra/host/nvhost_channel.c b/drivers/video/tegra/host/nvhost_channel.c index e7bbcc50043c..949e67ffb653 100644 --- a/drivers/video/tegra/host/nvhost_channel.c +++ b/drivers/video/tegra/host/nvhost_channel.c @@ -231,12 +231,12 @@ static void power_3d(struct nvhost_module *mod, enum nvhost_power_action action) NVSYNCPT_3D, syncval); nvhost_intr_add_action(&ch->dev->intr, NVSYNCPT_3D, - syncval, - NVHOST_INTR_ACTION_WAKEUP, - &wq, &ref); + syncval, + NVHOST_INTR_ACTION_WAKEUP, + &wq, &ref); wait_event(wq, - nvhost_syncpt_min_cmp(&ch->dev->syncpt, - NVSYNCPT_3D, syncval)); + nvhost_syncpt_min_cmp(&ch->dev->syncpt, + NVSYNCPT_3D, syncval)); nvhost_intr_put_ref(&ch->dev->intr, ref); nvhost_cdma_update(&ch->cdma); } |