diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2010-11-05 13:13:50 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:36:38 -0800 |
| commit | 9c0fc647f12d6fcd870232c9cf07c8bb24042b67 (patch) | |
| tree | be31fe25e12a25d91fb3974ff3797bfd965bac68 /drivers | |
| parent | 8ef865890c9583dfbeae978174d950a7794374fb (diff) | |
Revert "tegra: video: nvmap: Printk if nvmap alloc fails"
This reverts commit e3ad53ad739afae7e8a4252c807a195e2311cfa7.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap_ioctl.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c index 643b645d3f65..b943065a44c0 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.c +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c @@ -159,7 +159,6 @@ int nvmap_ioctl_alloc(struct file *filp, void __user *arg) { struct nvmap_alloc_handle op; struct nvmap_client *client = filp->private_data; - int ret; if (copy_from_user(&op, arg, sizeof(op))) return -EFAULT; @@ -174,12 +173,8 @@ int nvmap_ioctl_alloc(struct file *filp, void __user *arg) * data leakage. */ op.align = max_t(size_t, op.align, PAGE_SIZE); - ret = nvmap_alloc_handle_id(client, op.handle, op.heap_mask, - op.align, op.flags); - if (ret) - pr_err("%s: nvmap allocation failed (%d)\n", __func__, ret); - - return ret; + return nvmap_alloc_handle_id(client, op.handle, op.heap_mask, + op.align, op.flags); } int nvmap_ioctl_create(struct file *filp, unsigned int cmd, void __user *arg) |