diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /drivers/video/tegra/host/nvhost_syncpt.c | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'drivers/video/tegra/host/nvhost_syncpt.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_syncpt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c index 9fa7d0652c1f..38c28ca116e7 100644 --- a/drivers/video/tegra/host/nvhost_syncpt.c +++ b/drivers/video/tegra/host/nvhost_syncpt.c @@ -235,7 +235,7 @@ int nvhost_syncpt_wait_timeout(struct nvhost_syncpt *sp, u32 id, check_count++; } } - nvhost_intr_put_ref(&(syncpt_to_dev(sp)->intr), ref); + nvhost_intr_put_ref(&(syncpt_to_dev(sp)->intr), id, ref); done: nvhost_module_idle(syncpt_to_dev(sp)->dev); @@ -344,7 +344,7 @@ static ssize_t syncpt_min_show(struct kobject *kobj, struct nvhost_syncpt_attr *syncpt_attr = container_of(attr, struct nvhost_syncpt_attr, attr); - return snprintf(buf, PAGE_SIZE, "%d", + return snprintf(buf, PAGE_SIZE, "%u", nvhost_syncpt_read(&syncpt_attr->host->syncpt, syncpt_attr->id)); } @@ -355,7 +355,7 @@ static ssize_t syncpt_max_show(struct kobject *kobj, struct nvhost_syncpt_attr *syncpt_attr = container_of(attr, struct nvhost_syncpt_attr, attr); - return snprintf(buf, PAGE_SIZE, "%d", + return snprintf(buf, PAGE_SIZE, "%u", nvhost_syncpt_read_max(&syncpt_attr->host->syncpt, syncpt_attr->id)); } |