From patchwork Sat Dec 20 10:47:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 5522291 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 932879F1CD for ; Sat, 20 Dec 2014 10:51:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8CF72014A for ; Sat, 20 Dec 2014 10:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA43A2012B for ; Sat, 20 Dec 2014 10:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752928AbaLTKs0 (ORCPT ); Sat, 20 Dec 2014 05:48:26 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:34341 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752918AbaLTKsY (ORCPT ); Sat, 20 Dec 2014 05:48:24 -0500 Received: by mail-pd0-f180.google.com with SMTP id w10so2771789pde.25; Sat, 20 Dec 2014 02:48:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kEhHmUCpn3kFXeNiQr76CqR0ab036dK3efTFOtGKPUE=; b=f61EQmEwV4h9GvIcphS0hIhO2LEY16isGgqwzIB3gGZxsEtF4jBiP4jPlh68w/4IfJ +iTJMrz87g+PkkceBZfr9o45EnkDuylbQIwe7sSkGDyF0r52nGhrEVh9fAnPPctnShaU +9zaSHzJVmugzDkDiTGoRk1SEkSvnqEuvRW3+ZPmigcrje70Q9OZoT/0HUa5mOUcKzD/ Jt2czK+ye2i0zeKVSNhVbORhqTCqK90wEtSJ+QEQu8HrzrHr9ZR2O1h5/PbThGo8xL5K AMTx1fp1sVS8OhKeIp6z5SfN2nWlPlHWF8vGn0S8IbnofaIJbMR7d3cI3aSt8pT95VNa jvnQ== X-Received: by 10.68.201.233 with SMTP id kd9mr19059474pbc.149.1419072503730; Sat, 20 Dec 2014 02:48:23 -0800 (PST) Received: from localhost.localdomain ([49.203.40.145]) by mx.google.com with ESMTPSA id w8sm12007015pbt.71.2014.12.20.02.48.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 Dec 2014 02:48:23 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang Cc: LKML , adi-buildroot-devel@lists.sourceforge.net, Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH 05/15] media: blackfin: bfin_capture: improve queue_setup() callback Date: Sat, 20 Dec 2014 16:17:32 +0530 Message-Id: <1419072462-3168-6-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1419072462-3168-1-git-send-email-prabhakar.csengg@gmail.com> References: <1419072462-3168-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP this patch improves the queue_setup() callback. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/blackfin/bfin_capture.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 8bd94a1..76d42bb 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -44,7 +44,6 @@ #include #define CAPTURE_DRV_NAME "bfin_capture" -#define BCAP_MIN_NUM_BUF 2 struct bcap_format { char *desc; @@ -292,11 +291,14 @@ static int bcap_queue_setup(struct vb2_queue *vq, { struct bcap_device *bcap_dev = vb2_get_drv_priv(vq); - if (*nbuffers < BCAP_MIN_NUM_BUF) - *nbuffers = BCAP_MIN_NUM_BUF; + if (fmt && fmt->fmt.pix.sizeimage < bcap_dev->fmt.sizeimage) + return -EINVAL; + + if (vq->num_buffers + *nbuffers < 3) + *nbuffers = 3 - vq->num_buffers; *nplanes = 1; - sizes[0] = bcap_dev->fmt.sizeimage; + sizes[0] = fmt ? fmt->fmt.pix.sizeimage : bcap_dev->fmt.sizeimage; alloc_ctxs[0] = bcap_dev->alloc_ctx; return 0;