Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm: camera: Validate gpio calls for LED flash

Browse source 
If init call for LED flash is missed / failed, gpio_request() may not
be performed for gpio pins for LED flash. This causes stability issues
where gpio calls are performed without gpio_request. Check for valid
client before performing gpio configuration.

Change-Id: Ib232dd53b52af06981d53c799b000ac7f4917c9d
Signed-off-by: Sreesudhan Ramakrish Ramkumar <srramku@codeaurora.org>
(cherry picked from commit 952001729813a0184d95e20f30bee89d6a4cd9bc)
This commit is contained in:
Sreesudhan Ramakrish Ramkumar 2012-12-04 17:11:39 -08:00 committed by Stephen Boyd
parent 4fa9626c14
commit 47ae2e1ff3
1 changed files with 51 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/media/video/msm/flash.c
View file

@ -355,8 +355,10 @@ int msm_camera_flash_external(
break;
}
if (sc628a_client || tps61310_client) {
gpio_set_value_cansleep(external->led_en, 0);
gpio_free(external->led_en);
}
error:
pr_err("%s gpio request failed\n", __func__);
if (sc628a_client) {
@ -393,55 +395,61 @@ error:
break;
case MSM_CAMERA_LED_OFF:
if (sc628a_client || tps61310_client) {
if (sc628a_client) {
i2c_client.client = sc628a_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x02, 0x00,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x02,
0x00, MSM_CAMERA_I2C_BYTE_DATA);
}
if (tps61310_client) {
i2c_client.client = tps61310_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x01, 0x00,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x01,
0x00, MSM_CAMERA_I2C_BYTE_DATA);
}
gpio_set_value_cansleep(external->led_en, 0);
gpio_set_value_cansleep(external->led_flash_en, 0);
}
break;
case MSM_CAMERA_LED_LOW:
if (sc628a_client || tps61310_client) {
gpio_set_value_cansleep(external->led_en, 1);
gpio_set_value_cansleep(external->led_flash_en, 1);
usleep_range(2000, 3000);
if (sc628a_client) {
i2c_client.client = sc628a_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x02, 0x06,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x02,
0x06, MSM_CAMERA_I2C_BYTE_DATA);
}
if (tps61310_client) {
i2c_client.client = tps61310_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x01, 0x86,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x01,
0x86, MSM_CAMERA_I2C_BYTE_DATA);
}
}
break;
case MSM_CAMERA_LED_HIGH:
if (sc628a_client || tps61310_client) {
gpio_set_value_cansleep(external->led_en, 1);
gpio_set_value_cansleep(external->led_flash_en, 1);
usleep_range(2000, 3000);
if (sc628a_client) {
i2c_client.client = sc628a_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x02, 0x49,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x02,
0x49, MSM_CAMERA_I2C_BYTE_DATA);
}
if (tps61310_client) {
i2c_client.client = tps61310_client;
i2c_client.addr_type = MSM_CAMERA_I2C_BYTE_ADDR;
rc = msm_camera_i2c_write(&i2c_client, 0x01, 0x8B,
MSM_CAMERA_I2C_BYTE_DATA);
rc = msm_camera_i2c_write(&i2c_client, 0x01,
0x8B, MSM_CAMERA_I2C_BYTE_DATA);
}
}
break;