Message ID | CAPgLHd9hFGfuQ2Esm-7C1YdSgWojDJRADwv8_m5DnJ6UAFJtpQ@mail.gmail.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1Uoo1p-0006zX-MQ; Tue, 18 Jun 2013 07:00:25 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1Uoo1n-0002F3-5b; Tue, 18 Jun 2013 07:00:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753689Ab3FRFAU (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Tue, 18 Jun 2013 01:00:20 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:40303 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753584Ab3FRFAT (ORCPT <rfc822;linux-media@vger.kernel.org>); Tue, 18 Jun 2013 01:00:19 -0400 Received: by mail-bk0-f50.google.com with SMTP id ik8so1519034bkc.23 for <linux-media@vger.kernel.org>; Mon, 17 Jun 2013 22:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=vhkpwnSWmykjC6xOebeJtkz2nOqUCeXfsgMsgoryNgE=; b=WrnW/hffQoV8SqupgmdLIxVz1DsrLXK1h0qCCVdNEi0FBAL7U44xUJ0LzVm5vQxxTf +XJrvCNzq+KQezC1CvG22r1JGlukZ4OJDV4H9MRE8Rw5XuTbfzucxbseHV+v6P2wobBu dgjD8+x5YE5tcT2TfOVCSXXSIMkDCdXF35PbqqA+qz0gFgtx/EEHWtKv5yZUaJX7s+yM gwuTCpvp28iiDWRCTMAQGc07qQSk8d+LSNTEIHONdF5mrY4kaK383wNT1HW9XQtnR3bJ uLvn8zJ7zG17wWp8cu4Qirt0SpZcXDtDLYSNYfbciXa8HlIjDeKDz2GC/+XK844h3jqB 1O4Q== MIME-Version: 1.0 X-Received: by 10.205.25.137 with SMTP id ri9mr2340989bkb.151.1371531617843; Mon, 17 Jun 2013 22:00:17 -0700 (PDT) Received: by 10.204.39.1 with HTTP; Mon, 17 Jun 2013 22:00:17 -0700 (PDT) Date: Tue, 18 Jun 2013 13:00:17 +0800 Message-ID: <CAPgLHd9hFGfuQ2Esm-7C1YdSgWojDJRADwv8_m5DnJ6UAFJtpQ@mail.gmail.com> Subject: [PATCH -next] [media] coda: fix missing unlock on error in coda_stop_streaming() From: Wei Yongjun <weiyj.lk@gmail.com> To: mchehab@redhat.com, grant.likely@linaro.org, rob.herring@calxeda.com, p.zabel@pengutronix.de, javier.martin@vista-silicon.com, k.debski@samsung.com, hans.verkuil@cisco.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.6.18.45128 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_900_999 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' |
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
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
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 --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);