Merge "msm: camera: sensor: Detect flash_driver_type from dtsi" (3e5b20a2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -905,6 +905,14 @@ static int32_t msm_flash_get_dt_data(struct device_node *of_node,
		fctrl->flash_driver_type = FLASH_DRIVER_I2C;
		}

		/* Read the flash and torch source info from device tree node */
		rc = msm_flash_get_pmic_source_info(of_node, fctrl);
		if (rc < 0) {
		pr_err("%s:%d msm_flash_get_pmic_source_info failed rc %d\n",
		__func__, __LINE__, rc);
		return rc;
		}

		/* Read the gpio information from device tree */
		rc = msm_sensor_driver_get_gpio_data(
		&(fctrl->power_info.gpio_conf), of_node);
		@@ -919,13 +927,6 @@ static int32_t msm_flash_get_dt_data(struct device_node *of_node,
		CDBG("%s:%d fctrl->flash_driver_type = %d", __func__, __LINE__,
		fctrl->flash_driver_type);

		/* Read the flash and torch source info from device tree node */
		rc = msm_flash_get_pmic_source_info(of_node, fctrl);
		if (rc < 0) {
		pr_err("%s:%d msm_flash_get_pmic_source_info failed rc %d\n",
		__func__, __LINE__, rc);
		return rc;
		}
		return rc;
		}