diff options
| author | Shilpa Mamidi <shilpam@codeaurora.org> | 2015-12-31 17:29:02 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:16:55 -0700 |
| commit | be0afb13c5be47d1c9af77116c7f42b92074e681 (patch) | |
| tree | 137a988819a088b7cd00245c2735c2cc46610f16 | |
| parent | c63abb5d90d86edbc55ece1754992ecc8eac557d (diff) | |
msm: cpp: Checking for validity of regulator pointers
Not all targets have fs regulators, for such devices
crash is seen when firmware load fails. To fix this issue
validity check is made before disabling fs regulators.
Change-Id: Ib1b365bcdda724580e69d35dcf8dbeb25abc2b99
Signed-off-by: Shilpa Mamidi <shilpam@codeaurora.org>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c index 8c565951f75b..0b993396b9a9 100644 --- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c +++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c @@ -1192,11 +1192,15 @@ clk_failed: regulator_disable(cpp_dev->fs_cpp); regulator_put(cpp_dev->fs_cpp); fs_failed: - regulator_disable(cpp_dev->fs_camss); - regulator_put(cpp_dev->fs_camss); + if (cpp_dev->fs_camss) { + regulator_disable(cpp_dev->fs_camss); + regulator_put(cpp_dev->fs_camss); + } fs_camss_failed: - regulator_disable(cpp_dev->fs_mmagic_camss); - regulator_put(cpp_dev->fs_mmagic_camss); + if (cpp_dev->fs_mmagic_camss) { + regulator_disable(cpp_dev->fs_mmagic_camss); + regulator_put(cpp_dev->fs_mmagic_camss); + } fs_mmagic_failed: if (cpp_dev->bus_master_flag) msm_cpp_deinit_bandwidth_mgr(cpp_dev); |