summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2012-11-21 18:21:58 +0530
committerSimone Willett <swillett@nvidia.com>2012-11-28 17:43:48 -0800
commit3aaea8d82e54da58ef4ce203727a72a4160edae5 (patch)
treedaf46a9ed80396ca8ded80ea12887ea24b233283 /drivers/media/video
parentc7faf7f382c9330a487195ae13cc19cc0c018471 (diff)
media: video: tegra: fix unused code
-fix coverity issue ad5816: fix logically dead code Coverity id : 21006 ov5640: fix unused pointer value Coverity id : 18076 tegra_camera: fix logically dead code Coverity id : 11332 Bug 1046331 Change-Id: I1b32ec3ae3145d77142fcfa96d68477da4fc20b3 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/165369 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Frank Chen <frankc@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tegra/ad5816.c3
-rw-r--r--drivers/media/video/tegra/ov5640.c2
-rw-r--r--drivers/media/video/tegra/tegra_camera.c2
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/tegra/ad5816.c b/drivers/media/video/tegra/ad5816.c
index f5c0dd89fdc2..3ba1b3b830bd 100644
--- a/drivers/media/video/tegra/ad5816.c
+++ b/drivers/media/video/tegra/ad5816.c
@@ -313,9 +313,6 @@ static int ad5816_pm_wr(struct ad5816_info *info, int pwr)
dev_dbg(&info->i2c_client->dev, "%s pwr_dev=%d\n", __func__,
info->pwr_dev);
- if (err > 0)
- return 0;
-
return err;
}
diff --git a/drivers/media/video/tegra/ov5640.c b/drivers/media/video/tegra/ov5640.c
index 32a84b495d12..f7a6b59fe42b 100644
--- a/drivers/media/video/tegra/ov5640.c
+++ b/drivers/media/video/tegra/ov5640.c
@@ -500,7 +500,7 @@ static int ov5640_remove(struct i2c_client *client)
{
struct ov5640_info *info;
info = i2c_get_clientdata(client);
- misc_deregister(&ov5640_device);
+ misc_deregister(&(info->miscdev_info));
return 0;
}
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c
index 0fafbefb3ed1..ec5697a2af3d 100644
--- a/drivers/media/video/tegra/tegra_camera.c
+++ b/drivers/media/video/tegra/tegra_camera.c
@@ -385,7 +385,7 @@ static int tegra_camera_release(struct inode *inode, struct file *file)
if (ret)
goto release_exit;
/* turn off CSI regulator */
- tegra_camera_power_off(dev);
+ ret = tegra_camera_power_off(dev);
if (ret)
goto release_exit;