From patchwork Thu Jan 22 22:18:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5689101 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B8A70C058D for ; Thu, 22 Jan 2015 22:23:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0661C2026F for ; Thu, 22 Jan 2015 22:23:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AAE820265 for ; Thu, 22 Jan 2015 22:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754311AbbAVWVI (ORCPT ); Thu, 22 Jan 2015 17:21:08 -0500 Received: from mail-wg0-f45.google.com ([74.125.82.45]:40718 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753802AbbAVWUu (ORCPT ); Thu, 22 Jan 2015 17:20:50 -0500 Received: by mail-wg0-f45.google.com with SMTP id x12so4351018wgg.4; Thu, 22 Jan 2015 14:20:49 -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=HKKZn2c0nxhsgsmJdws9YT6O809ioX+HTVAVEqwbVBo=; b=IrtLbf6ndMpp23p3Uron97rfR1sfv2kWQzvInl7T9xtQJKB++PJri6mZq/kew/iTvL /MfueMA8ijii9b2R2Te3Clj69mKy9H8fNB5fb4+JvGSo2V7tWN3HoXdnl9zsrjnyUaIR UD4GEpxdZMry7LO63qTMh2FbCPrOvLSRLSb9MSiMLkZjeVRPqm//VLraZFyUoiBNO8k6 rWrIqdmy39oOQWVUQnK5yNe4jY708O4yttfG2ACn3URkcqoA88Scie9lF0FgZBnmCXwo L4gHHkSp7bzzZErt4VRN0L57C5iJ2Ph0rOmkNfJ5dP8hlilk6RhQCw9iKWO4wlmRx0I/ rszA== X-Received: by 10.194.185.15 with SMTP id ey15mr7440375wjc.3.1421965249554; Thu, 22 Jan 2015 14:20:49 -0800 (PST) Received: from tango-charlie.Home ([2.218.173.171]) by mx.google.com with ESMTPSA id fi10sm4757888wib.13.2015.01.22.14.20.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 14:20:47 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang , adi-buildroot-devel@lists.sourceforge.net Cc: LKML , Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH v2 05/15] media: blackfin: bfin_capture: improve queue_setup() callback Date: Thu, 22 Jan 2015 22:18:38 +0000 Message-Id: <1421965128-10470-6-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421965128-10470-1-git-send-email-prabhakar.csengg@gmail.com> References: <1421965128-10470-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..0d8593b 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 < 2) + *nbuffers = 2; *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;