Revert "tegra: video: nvmap: Printk if nvmap alloc fails"
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 5 Nov 2010 20:13:50 +0000 (13:13 -0700)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 5 Nov 2010 20:13:50 +0000 (13:13 -0700)
This reverts commit e3ad53ad739afae7e8a4252c807a195e2311cfa7.

drivers/video/tegra/nvmap/nvmap_ioctl.c

index 643b645d3f6555453748a954db52d3d9a83dc0d2..b943065a44c0f7a6be36063c3695a9089b9d5ae0 100644 (file)
@@ -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)