Merge "msm: camera: fix camera crash after daemon reboot"
diff --git a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
index 7649a40..059780d 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
@@ -131,12 +131,6 @@
e_ctrl->cal_data.mapdata,
cdata->cfg.read_data.num_bytes);
- /* should only be called once. free kernel resource */
- if (!rc) {
- kfree(e_ctrl->cal_data.mapdata);
- kfree(e_ctrl->cal_data.map);
- memset(&e_ctrl->cal_data, 0, sizeof(e_ctrl->cal_data));
- }
return rc;
}