From patchwork Mon Oct 22 05:27:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15105 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TQAY0-00036F-JK for patchwork@linuxtv.org; Mon, 22 Oct 2012 07:27:32 +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.75/mailfrontend-2) with esmtp for id 1TQAXz-0006Ir-Ix; Mon, 22 Oct 2012 07:27:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494Ab2JVF1a (ORCPT ); Mon, 22 Oct 2012 01:27:30 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:56949 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752206Ab2JVF13 (ORCPT ); Mon, 22 Oct 2012 01:27:29 -0400 Received: by mail-qc0-f174.google.com with SMTP id o22so1242284qcr.19 for ; Sun, 21 Oct 2012 22:27:28 -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=7VhsafKONci3PxE349wo6KFOw2FFTsRkuzKgqoefE58=; b=P/P6CbFt0rUvi5pYeYVgHB/Q7tHy8bd9dXgOPhYSwoMJGG/Jca6hPzEudU0ZGFJnXE 76K4hF0zMI+uTOww38YZ6HIEdYeVIpQ4XGd7kuCzI7iymJGYgcM9kghUVVWSxK7bDfrZ 09HMPInEQJ92T6WS31VUmLd3nxVoXGWuvNpEnUBJ+wAcC+kbusT3kjV1pZkPx8tKo7F2 R5IeTB6oVPo/AQ2JL1RFTI6VSPCvMfDsNT679UFnby5ePkBPqMjJLdWFKU959ZoJnncc qh7TAOzk9srleyJjx0TcwPsKIjl8b6/V0ZJd47/YKnwPXG0oX81OGJhJBNEdMILqiFha 3ylg== MIME-Version: 1.0 Received: by 10.49.85.202 with SMTP id j10mr4393510qez.59.1350883648832; Sun, 21 Oct 2012 22:27:28 -0700 (PDT) Received: by 10.229.134.205 with HTTP; Sun, 21 Oct 2012 22:27:28 -0700 (PDT) Date: Mon, 22 Oct 2012 13:27:28 +0800 Message-ID: Subject: [PATCH] [media] mx2_camera: fix missing unlock on error in mx2_start_streaming() From: Wei Yongjun To: g.liakhovetski@gmx.de, mchehab@infradead.org Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.22.51522 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_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 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, __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 ' From: Wei Yongjun Add the missing unlock on the error handle path in function mx2_start_streaming(). Signed-off-by: Wei Yongjun --- drivers/media/platform/soc_camera/mx2_camera.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 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/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 9fd9d1c..ccb9722 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@ -864,8 +864,10 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count) bytesperline = soc_mbus_bytes_per_line(icd->user_width, icd->current_fmt->host_fmt); - if (bytesperline < 0) + if (bytesperline < 0) { + spin_unlock_irqrestore(&pcdev->lock, flags); return bytesperline; + } /* * I didn't manage to properly enable/disable the prp @@ -878,8 +880,10 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count) pcdev->discard_buffer = dma_alloc_coherent(ici->v4l2_dev.dev, pcdev->discard_size, &pcdev->discard_buffer_dma, GFP_KERNEL); - if (!pcdev->discard_buffer) + if (!pcdev->discard_buffer) { + spin_unlock_irqrestore(&pcdev->lock, flags); return -ENOMEM; + } pcdev->buf_discard[0].discard = true; list_add_tail(&pcdev->buf_discard[0].queue,