diff options
| -rwxr-xr-x | drivers/media/video/ce147.c | 28 | ||||
| -rwxr-xr-x | include/linux/videodev2_samsung.h | 5 |
2 files changed, 2 insertions, 31 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; diff --git a/include/linux/videodev2_samsung.h b/include/linux/videodev2_samsung.h index 6a86433..13ec5d6 100755 --- a/include/linux/videodev2_samsung.h +++ b/include/linux/videodev2_samsung.h @@ -170,11 +170,6 @@ enum v4l2_flash_mode { FLASH_MODE_AUTO, FLASH_MODE_ON, FLASH_MODE_TORCH, -#ifdef CONFIG_SAMSUNG_FASCINATE - FLASH_MODE_TORCH_ON, - FLASH_MODE_TORCH_OFF, - FLASH_MODE_BACKLIGHT_ON, -#endif FLASH_MODE_MAX, }; |