diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-05 16:10:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-05 16:10:15 -0700 |
| commit | b4a52c84e335c77cfefe2db522a8c7be6a7ccde2 (patch) | |
| tree | c686576072059470c1d5765163318252b1d19fdd | |
| parent | f165bb6da1e9214af2e578f6578b8d9a8a2cbae1 (diff) | |
| parent | 2b32c1afd4ccf088d1d07edd4924d806adbde46e (diff) | |
Merge "msm: camera: Check if regulator is null before enabling"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c b/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c index f6d7f5fb8d32..8a49c7cf9f4a 100644 --- a/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c +++ b/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c @@ -424,7 +424,7 @@ int msm_camera_config_vreg(struct device *dev, struct camera_vreg_t *cam_vreg, curr_vreg = &cam_vreg[j]; reg_ptr[j] = regulator_get(dev, curr_vreg->reg_name); - if (IS_ERR(reg_ptr[j])) { + if (IS_ERR_OR_NULL(reg_ptr[j])) { pr_err("%s: %s get failed\n", __func__, curr_vreg->reg_name); @@ -531,7 +531,7 @@ int msm_camera_enable_vreg(struct device *dev, struct camera_vreg_t *cam_vreg, continue; } else j = i; - if (IS_ERR(reg_ptr[j])) { + if (IS_ERR_OR_NULL(reg_ptr[j])) { pr_err("%s: %s null regulator\n", __func__, cam_vreg[j].reg_name); goto disable_vreg; |