openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: i2c: lm3560: fix missing unlock on error in lm3560_set_ctrl() 

Add the missing unlock before return from function lm3560_set_ctrl()
in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Wei Yongjun 2013-11-07 09:44:42 -03:00 committed by Mauro Carvalho Chehab
parent fe9a2bd881
commit eed8c3eebc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,15 +219,19 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
break; break;
case V4L2_CID_FLASH_STROBE: case V4L2_CID_FLASH_STROBE:
if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) {
return -EBUSY; rval = -EBUSY;
goto err_out;
}
flash->led_mode = V4L2_FLASH_LED_MODE_FLASH; flash->led_mode = V4L2_FLASH_LED_MODE_FLASH;
rval = lm3560_mode_ctrl(flash); rval = lm3560_mode_ctrl(flash);
break; break;
case V4L2_CID_FLASH_STROBE_STOP: case V4L2_CID_FLASH_STROBE_STOP:
if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) {
return -EBUSY; rval = -EBUSY;
goto err_out;
}
flash->led_mode = V4L2_FLASH_LED_MODE_NONE; flash->led_mode = V4L2_FLASH_LED_MODE_NONE;
rval = lm3560_mode_ctrl(flash); rval = lm3560_mode_ctrl(flash);
break; break;
@ -247,8 +251,8 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
break; break;
} }
mutex_unlock(&flash->lock);
err_out: err_out:
mutex_unlock(&flash->lock);
return rval; return rval;
} }