From patchwork Sat Aug 25 03:09:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 1372911 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B39F9DF264 for ; Sat, 25 Aug 2012 03:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754629Ab2HYDJV (ORCPT ); Fri, 24 Aug 2012 23:09:21 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:44969 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753353Ab2HYDJR (ORCPT ); Fri, 24 Aug 2012 23:09:17 -0400 Received: by mail-gg0-f174.google.com with SMTP id k6so581646ggd.19 for ; Fri, 24 Aug 2012 20:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=FCem+GqBtYBRWCG8bpYYChHkKZ0d0qNqbFxICURULEo=; b=C8OQY0cv8grHqpjRof/p6TQ1/CxlQtGLQqcCWCSzZRW8eHuozRO/CEsyJ2g3AjjgvL lKlXlkCNVcBMpy+kpLEuv8cg/E1now1OWB6EW0joLtf/DKPlSLtwsi5/bU9K7GsWVurq 5KXx4q7EB0nCS1veK3l9N9B/cChXsEFM1AIxBixQ1hjDGIAHedhdldeBxZwSq8xRP+/+ Xx6mxO8nKa84HJNfJKtr/tm4kvdC/0NXGbiycC/O9R5ezMEjkGH0nxxBo/OwWrr6byms lVup1TS1Tq76N6kggbqWG+vDLP1zikjaWieUh9Pka52R0t19ZgjUVswwkGMczAeTIkXF 5K3w== Received: by 10.236.170.135 with SMTP id p7mr6375500yhl.109.1345864157530; Fri, 24 Aug 2012 20:09:17 -0700 (PDT) Received: from localhost.cpe.express.com.ar ([200.81.126.15]) by mx.google.com with ESMTPS id o25sm22166065yhm.14.2012.08.24.20.09.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 20:09:17 -0700 (PDT) From: Ezequiel Garcia To: , Mauro Carvalho Chehab Cc: Ezequiel Garcia , Jonathan Corbet Subject: [PATCH 5/9] marvel-cam: Don't check vb2_queue_init() return value Date: Sat, 25 Aug 2012 00:09:02 -0300 Message-Id: <1345864146-2207-5-git-send-email-elezegarcia@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1345864146-2207-1-git-send-email-elezegarcia@gmail.com> References: <1345864146-2207-1-git-send-email-elezegarcia@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Right now vb2_queue_init() returns always 0 and it will be changed to return void. Cc: Jonathan Corbet Signed-off-by: Ezequiel Garcia --- drivers/media/platform/marvell-ccic/mcam-core.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index ce2b7b4..e117adb 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -1098,7 +1098,7 @@ static const struct vb2_ops mcam_vb2_sg_ops = { #endif /* MCAM_MODE_DMA_SG */ -static int mcam_setup_vb2(struct mcam_camera *cam) +static void mcam_setup_vb2(struct mcam_camera *cam) { struct vb2_queue *vq = &cam->vb_queue; @@ -1139,7 +1139,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam) #endif break; } - return vb2_queue_init(vq); + vb2_queue_init(vq); } static void mcam_cleanup_vb2(struct mcam_camera *cam) @@ -1548,15 +1548,12 @@ static int mcam_v4l_open(struct file *filp) frames = singles = delivered = 0; mutex_lock(&cam->s_mutex); if (cam->users == 0) { - ret = mcam_setup_vb2(cam); - if (ret) - goto out; + mcam_setup_vb2(cam); mcam_ctlr_power_up(cam); __mcam_cam_reset(cam); mcam_set_config_needed(cam, 1); } (cam->users)++; -out: mutex_unlock(&cam->s_mutex); return ret; }