From patchwork Mon Feb 13 13:51:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 9864 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RwwKD-0000pB-UQ for patchwork@linuxtv.org; Mon, 13 Feb 2012 14:52:13 +0100 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 1RwwKC-0002B2-It; Mon, 13 Feb 2012 14:52:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756523Ab2BMNwK (ORCPT ); Mon, 13 Feb 2012 08:52:10 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:43155 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000Ab2BMNwH (ORCPT ); Mon, 13 Feb 2012 08:52:07 -0500 Received: by werb13 with SMTP id b13so3480160wer.19 for ; Mon, 13 Feb 2012 05:52:06 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.135.15 with SMTP id t15mr6349093wei.3.1329141126626; Mon, 13 Feb 2012 05:52:06 -0800 (PST) Received: from localhost.localdomain (182.50.18.95.dynamic.jazztel.es. [95.18.50.182]) by mx.google.com with ESMTPS id eq5sm46989029wib.2.2012.02.13.05.52.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 05:52:06 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, mchehab@infradead.org, s.hauer@pengutronix.de, Javier Martin Subject: [PATCH 1/6] media: i.MX27 camera: Remove goto from mx2_videobuf_queue(). Date: Mon, 13 Feb 2012 14:51:50 +0100 Message-Id: <1329141115-23133-2-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> References: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQkNyY4MSmTgctNdj2sgigAwaVMRZrYX3BL4LARB2J6IHnjhzI01pVFS1THc1JqMRrqx5RwO 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.2.13.133914 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Javier Martin --- drivers/media/video/mx2_camera.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index e70d26f..1f046a3 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -580,9 +580,7 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) buf->state = MX2_STATE_QUEUED; list_add_tail(&buf->queue, &pcdev->capture); - if (mx27_camera_emma(pcdev)) { - goto out; - } else { /* cpu_is_mx25() */ + if (cpu_is_mx25()) { u32 csicr3, dma_inten = 0; if (pcdev->fb1_active == NULL) { @@ -618,7 +616,6 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) } } -out: spin_unlock_irqrestore(&pcdev->lock, flags); }