diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
| commit | 94596e0f2e5485acce0d6eef11799c5c35610cd5 (patch) | |
| tree | 8b53e2a7700aad78e278288f5aed6d95f514bc23 /drivers/media/video/tegra/nvavp/nvavp_dev.c | |
| parent | 7ca2a5f1d750b580f5093c2c6895772b32d30f66 (diff) | |
| parent | b17f01f41b5cd2a49e48b87fb51d59c181819d89 (diff) | |
Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
Diffstat (limited to 'drivers/media/video/tegra/nvavp/nvavp_dev.c')
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index b695aa16af59..c593a0ad756b 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -205,8 +205,8 @@ static void nvavp_set_channel_control_area(struct nvavp_info *nvavp, int channel writel(0x0, &control->get); pr_debug("nvavp_set_channel_control_area for channel_id (%d):\ - control->put (0x%x) control->get (0x%x)\n", - channel_id, &control->put, &control->get); + control->put (0x%08x) control->get (0x%08x)\n", + channel_id, (u32) &control->put, (u32) &control->get); /* enable avp VDE clock control and disable iram clock gating */ writel(0x0, &control->idle_clk_enable); @@ -548,7 +548,7 @@ static int nvavp_pushbuffer_update(struct nvavp_info *nvavp, u32 phys_addr, control = channel_info->os_control; pr_debug("nvavp_pushbuffer_update for channel_id (%d):\ control->put (0x%x) control->get (0x%x)\n", - channel_id, &control->put, &control->get); + channel_id, (u32) &control->put, (u32) &control->get); mutex_lock(&channel_info->pushbuffer_lock); |