diff mbox

[-next,media] coda: fix missing unlock on error in coda_stop_streaming()

Message ID CAPgLHd9hFGfuQ2Esm-7C1YdSgWojDJRADwv8_m5DnJ6UAFJtpQ@mail.gmail.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Wei Yongjun June 18, 2013, 5 a.m. UTC 
  From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/media/platform/coda.c | 1 +
 1 file changed, 1 insertion(+)


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Philipp Zabel June 18, 2013, 10:03 a.m. UTC | #1 
Am Dienstag, den 18.06.2013, 13:00 +0800 schrieb Wei Yongjun:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Add the missing unlock before return from function coda_stop_streaming()
> in the error handling case.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>  drivers/media/platform/coda.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> index df4ada88..2c3cd17 100644
> --- a/drivers/media/platform/coda.c
> +++ b/drivers/media/platform/coda.c
> @@ -1347,6 +1347,7 @@ static int coda_stop_streaming(struct vb2_queue *q)
>  	if (coda_command_sync(ctx, CODA_COMMAND_SEQ_END)) {
>  		v4l2_err(&dev->v4l2_dev,
>  			 "CODA_COMMAND_SEQ_END failed\n");
> +		mutex_unlock(&dev->coda_mutex);
>  		return -ETIMEDOUT;
>  	}
>  	mutex_unlock(&dev->coda_mutex);
> 
> 

Thanks! If you don't mind, I'll integrate this change into the "[media]
coda: add CODA7541 decoding support" for v2.

regards
Philipp

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wei Yongjun June 18, 2013, 12:23 p.m. UTC | #2 
On 06/18/2013 06:03 PM, Philipp Zabel wrote:
> Am Dienstag, den 18.06.2013, 13:00 +0800 schrieb Wei Yongjun:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>
>> Add the missing unlock before return from function coda_stop_streaming()
>> in the error handling case.
>>
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> ---
>>  drivers/media/platform/coda.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
>> index df4ada88..2c3cd17 100644
>> --- a/drivers/media/platform/coda.c
>> +++ b/drivers/media/platform/coda.c
>> @@ -1347,6 +1347,7 @@ static int coda_stop_streaming(struct vb2_queue *q)
>>  	if (coda_command_sync(ctx, CODA_COMMAND_SEQ_END)) {
>>  		v4l2_err(&dev->v4l2_dev,
>>  			 "CODA_COMMAND_SEQ_END failed\n");
>> +		mutex_unlock(&dev->coda_mutex);
>>  		return -ETIMEDOUT;
>>  	}
>>  	mutex_unlock(&dev->coda_mutex);
>>
>>
> Thanks! If you don't mind, I'll integrate this change into the "[media]
> coda: add CODA7541 decoding support" for v2.

No problem. Thanks.

Yongjun Wei

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index df4ada88..2c3cd17 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1347,6 +1347,7 @@  static int coda_stop_streaming(struct vb2_queue *q)
 	if (coda_command_sync(ctx, CODA_COMMAND_SEQ_END)) {
 		v4l2_err(&dev->v4l2_dev,
 			 "CODA_COMMAND_SEQ_END failed\n");
+		mutex_unlock(&dev->coda_mutex);
 		return -ETIMEDOUT;
 	}
 	mutex_unlock(&dev->coda_mutex);