evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] media: i2c: lm3560: fix missing unlock on error, fault handling

Browse source 
Correct reference of reading values. (rval -> reg_val)
Add the missing unlock before return from function lm3560_get_ctrl()
to avoid deadlock.
Thank you Dan Carpenter & Sakari.

Signed-off-by: Daniel Jeong <gshark.jeong@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Daniel Jeong 2013-12-06 02:43:27 -03:00 • committed by Mauro Carvalho Chehab
parent dc793175c5
commit e1c759bd3d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/i2c/lm3560.c
View file

@ -172,28 +172,28 @@ static int lm3560_flash_brt_ctrl(struct lm3560_flash *flash,
static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
{ {
struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no); struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no);
int rval = -EINVAL;
mutex_lock(&flash->lock); mutex_lock(&flash->lock);
if (ctrl->id == V4L2_CID_FLASH_FAULT) { if (ctrl->id == V4L2_CID_FLASH_FAULT) {
int rval;
s32 fault = 0; s32 fault = 0;
unsigned int reg_val; unsigned int reg_val;
rval = regmap_read(flash->regmap, REG_FLAG, &reg_val); rval = regmap_read(flash->regmap, REG_FLAG, &reg_val);
if (rval < 0) if (rval < 0)
return rval; goto out;
if (rval & FAULT_SHORT_CIRCUIT) if (reg_val & FAULT_SHORT_CIRCUIT)
fault |= V4L2_FLASH_FAULT_SHORT_CIRCUIT; fault |= V4L2_FLASH_FAULT_SHORT_CIRCUIT;
if (rval & FAULT_OVERTEMP) if (reg_val & FAULT_OVERTEMP)
fault |= V4L2_FLASH_FAULT_OVER_TEMPERATURE; fault |= V4L2_FLASH_FAULT_OVER_TEMPERATURE;
if (rval & FAULT_TIMEOUT) if (reg_val & FAULT_TIMEOUT)
fault |= V4L2_FLASH_FAULT_TIMEOUT; fault |= V4L2_FLASH_FAULT_TIMEOUT;
ctrl->cur.val = fault; ctrl->cur.val = fault;
return 0;
} }
out:
mutex_unlock(&flash->lock); mutex_unlock(&flash->lock);
return -EINVAL; return rval;
} }
static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)