diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:00:05 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:00:13 +0300 |
| commit | adfbee2238439cd24ab80454bf2307dbd6ec21f7 (patch) | |
| tree | 5ecd60f454477a6fa04ab2f729ebd7963b0eff9b | |
| parent | 7ed73b7403cc5d79d2c2c9bd70948c9673d90e93 (diff) | |
Revert "msm: camera: Remove useless NULL checks in msm_flash_i2c_release"
* We'll take the upstream fix
This reverts commit bd102f6eb980e510fab9f4c86309724c846c8382.
Change-Id: Iaf2887d6975cf8083a92f90e5b96091db526af67
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c index 3933b97e4adc..c77367ed1603 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c +++ b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c @@ -361,7 +361,14 @@ static int32_t msm_flash_gpio_init( static int32_t msm_flash_i2c_release( struct msm_flash_ctrl_t *flash_ctrl) { - int32_t rc; + int32_t rc = 0; + + if (!(&flash_ctrl->power_info) || !(&flash_ctrl->flash_i2c_client)) { + pr_err("%s:%d failed: %pK %pK\n", + __func__, __LINE__, &flash_ctrl->power_info, + &flash_ctrl->flash_i2c_client); + return -EINVAL; + } rc = msm_camera_power_down(&flash_ctrl->power_info, flash_ctrl->flash_device_type, |