diff options
| author | jt1134 <jt1134@gmail.com> | 2012-08-21 23:08:29 -0500 |
|---|---|---|
| committer | jt1134 <jt1134@gmail.com> | 2012-08-21 23:08:29 -0500 |
| commit | 662301ca8f661c9975abae261a7938d8b125f1a5 (patch) | |
| tree | 32889d6bd1f1a11eedb6a8768173fc26fe0e16fa /drivers/media | |
| parent | 0c3f5d384b092e6d9874faed0c1122c95e6ca32b (diff) | |
| download | kernel_samsung_aries-662301ca8f661c9975abae261a7938d8b125f1a5.zip kernel_samsung_aries-662301ca8f661c9975abae261a7938d8b125f1a5.tar.gz kernel_samsung_aries-662301ca8f661c9975abae261a7938d8b125f1a5.tar.bz2 | |
ce147: remove Samsung-specific TORCH controls
this fixes issues with the video camera flash on the fascinate,
our open source camera HAL does not use the same naming conventions
that Samsung's proprietary HAL does
Change-Id: Ib52fd564f3aaaca30509f662de3bc536e987f1c4
Diffstat (limited to 'drivers/media')
| -rwxr-xr-x | drivers/media/video/ce147.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/media/video/ce147.c b/drivers/media/video/ce147.c index ca403c2..a3e2b1e 100755 --- a/drivers/media/video/ce147.c +++ b/drivers/media/video/ce147.c @@ -2706,7 +2706,7 @@ static int ce147_set_flash(struct v4l2_subdev *sd, struct v4l2_control *ctrl) unsigned char ce147_buf_set_flash_power_control[4] = {0x03,0x01,0x1D,0x0c}; unsigned int ce147_len_set_flash_power_control = 4; - if(ctrl->value != FLASH_MODE_TORCH_ON && ctrl->value != FLASH_MODE_TORCH_OFF) + if(ctrl->value != FLASH_MODE_TORCH) Flash_Mode = ctrl->value; #endif @@ -2723,24 +2723,9 @@ static int ce147_set_flash(struct v4l2_subdev *sd, struct v4l2_control *ctrl) ce147_buf_set_flash[1] = 0x01; break; -#ifdef CONFIG_SAMSUNG_FASCINATE - case FLASH_MODE_TORCH_ON: - ce147_buf_set_flash_manual[1] = 0x01; - break; - - case FLASH_MODE_TORCH_OFF: - ce147_buf_set_flash_manual[1] = 0x00; - break; - - case FLASH_MODE_BACKLIGHT_ON: - ce147_buf_set_flash_power_control[1] = 0x00; - ce147_buf_set_flash[1] = 0x01; - break; -#else case FLASH_MODE_TORCH: ce147_buf_set_flash_manual[1] = 0x01; break; -#endif default: ce147_buf_set_flash[1] = 0x00; @@ -2755,7 +2740,7 @@ static int ce147_set_flash(struct v4l2_subdev *sd, struct v4l2_control *ctrl) return -EIO; } //need to modify flash off for torch mode - if(ctrl->value == FLASH_MODE_TORCH_ON ||ctrl->value == FLASH_MODE_TORCH_OFF) { + if(ctrl->value == FLASH_MODE_TORCH || ctrl->value == FLASH_MODE_OFF) { err = ce147_i2c_write_multi(client, CMD_SET_FLASH_MANUAL, ce147_buf_set_flash_manual, ce147_len_set_flash_manual); if (err < 0) { dev_err(&client->dev, "%s: failed: i2c_write for set_flash\n", __func__); @@ -2846,15 +2831,6 @@ static int ce147_set_preflash(struct v4l2_subdev *sd, int flash_mode) //SecFeatu } break; - case FLASH_MODE_BACKLIGHT_ON: - ce147_buf_set_preflash[1] = 0x01; - ce147_buf_set_flash[1] = 0x01; - err = ce147_i2c_write_multi(client, 0x07, ce147_buf_set_preflash_init, ce147_len_set_preflash_init); - if(err < 0){ - dev_err(&client->dev, "%s: failed: i2c_write for set_preflash\n", __func__); - return -EIO; - } - break; default: ce147_buf_set_preflash[1] = 0x00; ce147_buf_set_flash[1] = 0x00; |