Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2c2bb3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Enable support for flash module" into msm-4.14

parents 8a9c289a 8981aed5

drivers/media/platform/msm/camera/cam_sensor_module/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_io/ 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_csiphy/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_actuator/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor/

#obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_eeprom/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_ois/

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int cam_flash_ops(struct cam_flash_ctrl *flash_ctrl, 
	if (flash_ctrl->switch_trigger)

		cam_res_mgr_led_trigger_event(

			flash_ctrl->switch_trigger,

			LED_SWITCH_ON);

			(enum led_brightness)LED_SWITCH_ON);



	return 0;

}
@@ -212,7 +212,7 @@ int cam_flash_off(struct cam_flash_ctrl *flash_ctrl) 


	if (flash_ctrl->switch_trigger)

		cam_res_mgr_led_trigger_event(flash_ctrl->switch_trigger,

			LED_SWITCH_OFF);

			(enum led_brightness)LED_SWITCH_OFF);



	flash_ctrl->flash_state = CAM_FLASH_STATE_START;

	return 0;