diff options
| -rw-r--r-- | drivers/media/video/tegra/avp/avp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/tegra/avp/avp.c b/drivers/media/video/tegra/avp/avp.c index 964b7c7cf320..b2870730b31c 100644 --- a/drivers/media/video/tegra/avp/avp.c +++ b/drivers/media/video/tegra/avp/avp.c @@ -2,7 +2,7 @@ * Copyright (C) 2010 Google, Inc. * Author: Dima Zavin <dima@android.com> * - * Copyright (C) 2010-2011 NVIDIA Corporation + * Copyright (C) 2010-2012 NVIDIA Corporation * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -1173,9 +1173,9 @@ static int _load_lib(struct tegra_avp_info *avp, struct tegra_avp_lib *lib, } lib_phys = nvmap_pin(avp->nvmap_libs, lib_handle); - if (IS_ERR_OR_NULL((void *)lib_phys)) { + if (IS_ERR_VALUE(lib_phys)) { pr_err("avp_lib: can't nvmap pin for lib '%s'\n", lib->name); - ret = PTR_ERR(lib_handle); + ret = lib_phys; goto err_nvmap_pin; } @@ -1637,9 +1637,9 @@ static int tegra_avp_probe(struct platform_device *pdev) avp->kernel_phys = nvmap_pin(avp->nvmap_drv, avp->kernel_handle); - if (IS_ERR_OR_NULL((void *)avp->kernel_phys)) { + if (IS_ERR_VALUE(avp->kernel_phys)) { pr_err("%s: cannot pin kernel handle\n", __func__); - ret = PTR_ERR((void *)avp->kernel_phys); + ret = avp->kernel_phys; goto err_nvmap_pin; } @@ -1665,9 +1665,9 @@ static int tegra_avp_probe(struct platform_device *pdev) avp->kernel_phys = nvmap_pin(avp->nvmap_drv, avp->kernel_handle); - if (IS_ERR_OR_NULL((void *)avp->kernel_phys)) { + if (IS_ERR_VALUE(avp->kernel_phys)) { pr_err("%s: cannot pin kernel handle\n", __func__); - ret = PTR_ERR((void *)avp->kernel_phys); + ret = avp->kernel_phys; goto err_nvmap_pin; } @@ -1694,9 +1694,9 @@ static int tegra_avp_probe(struct platform_device *pdev) } avp->iram_backup_phys = nvmap_pin(avp->nvmap_drv, avp->iram_backup_handle); - if (IS_ERR_OR_NULL((void *)avp->iram_backup_phys)) { + if (IS_ERR_VALUE(avp->iram_backup_phys)) { pr_err("%s: cannot pin iram backup handle\n", __func__); - ret = PTR_ERR((void *)avp->iram_backup_phys); + ret = avp->iram_backup_phys; goto err_iram_nvmap_pin; } |