diff options
| author | Nitin Pai <npai@nvidia.com> | 2012-01-10 19:53:47 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-01-30 12:31:27 -0800 |
| commit | fdc702e90e374d4f054ee082476de43b00600b04 (patch) | |
| tree | 2779b6942f27fc2b0c80be078502266b25f03d53 /drivers/media | |
| parent | 911318c9e3c928bb6d835f0c5a14d7780d390a65 (diff) | |
media: video: tegra: Override no regulator device
Dont fail if there is no regulator device.
For all other cases return failure.
Bug 898252
Reviewed-on: http://git-master/r/73026
Change-Id: Iab987a5d948cd7f3c3373cd3d12f52d480767772
Signed-off-by: Nitin Pai <npai@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/77745
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/tegra/tegra_camera.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/tegra/tegra_camera.c b/drivers/media/video/tegra/tegra_camera.c index 7b6d8fd868e1..fae9d31eacab 100644 --- a/drivers/media/video/tegra/tegra_camera.c +++ b/drivers/media/video/tegra/tegra_camera.c @@ -2,6 +2,7 @@ * drivers/media/video/tegra/tegra_camera.c * * Copyright (C) 2010 Google, Inc. + * Copyright (C) 2012 Nvidia Corp * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -481,8 +482,15 @@ static int tegra_camera_probe(struct platform_device *pdev) dev->reg = regulator_get(&pdev->dev, "avdd_dsi_csi"); #endif if (IS_ERR_OR_NULL(dev->reg)) { - dev_err(&pdev->dev, "%s: couldn't get regulator\n", __func__); - return PTR_ERR(dev->reg); + if (dev->reg == ERR_PTR(-ENODEV)) { + dev->reg = NULL; + dev_info(&pdev->dev, "%s: no regulator device, overriding\n", + __func__); + } else { + dev_err(&pdev->dev, "%s: couldn't get regulator\n", + __func__); + return PTR_ERR(dev->reg); + } } dev->misc_dev.minor = MISC_DYNAMIC_MINOR; |