| commit | 77650916337d5b8ab6f169b2a74839a738bbca92 | [log] [tgz] |
|---|---|---|
| author | Jeyaprakash Soundrapandian <jsoundra@quicinc.com> | Tue Oct 10 00:58:15 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Oct 10 00:58:15 2017 -0700 |
| tree | 89c73de31bc8fee5b55658d384b827465794a441 | |
| parent | 524b0ac3cb6b51d90c846096c7ffca3773503876 [diff] | |
| parent | d02f7ad3ffce1d5a7cf2f5c41aae1348b1d92be1 [diff] |
Merge "msm: camera: Fix crash in EEPROM reading" into dev/msm-4.9-camx
diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c b/drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c index a173954..8a631ae 100644 --- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c +++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
@@ -668,7 +668,7 @@ case CAM_EEPROM_PACKET_OPCODE_INIT: if (e_ctrl->userspace_probe == false) { rc = cam_eeprom_parse_read_memory_map( - e_ctrl->pdev->dev.of_node, e_ctrl); + e_ctrl->soc_info.dev->of_node, e_ctrl); if (rc < 0) { CAM_ERR(CAM_EEPROM, "Failed: rc : %d", rc); return rc;