From patchwork Sat Dec 20 10:47:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5522061 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17AECBEEA8 for ; Sat, 20 Dec 2014 10:48:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AF902014A for ; Sat, 20 Dec 2014 10:48:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C9142012B for ; Sat, 20 Dec 2014 10:48:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752959AbaLTKs1 (ORCPT ); Sat, 20 Dec 2014 05:48:27 -0500 Received: from mail-pd0-f175.google.com ([209.85.192.175]:60345 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752888AbaLTKsU (ORCPT ); Sat, 20 Dec 2014 05:48:20 -0500 Received: by mail-pd0-f175.google.com with SMTP id g10so2801152pdj.34; Sat, 20 Dec 2014 02:48:20 -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=vh4y07e1icxMoOfu7/zbFAsGgEpYJmnBGXsfNePIkmQ=; b=COMeeqeY8Mcf95ChlPEaRgjrakxdmCIKVYnwJDHCj22RsMu4YXAO2o0wZ/Fk7j7NxF rV1y1OrNrCUjM+NSeIDr6G7PlQjNTlZA4VodILPDODtBYcDFJDYF4EAxYDJJsYl8PN0E InWMNxL2BBwizBwvOB1cnC5B8J8JUFA34fTBR477tCOhnwi4VEq0N5VkZJU41Bc0bW/A Fjc+eGynTtDHEQNZO8onXH0HXOO4fiiSq7hy1OFzc+rKhe0UmCfzPulcxlPopvwDeCW+ D6SqM2SeaNpq9YfLeS1/FxZ2VtQ0DKSMR7bGYIXBBHhepolD3QUMF7xtKbrSeBpx4kX4 YLFw== X-Received: by 10.70.38.161 with SMTP id h1mr19543959pdk.97.1419072499994; Sat, 20 Dec 2014 02:48:19 -0800 (PST) Received: from localhost.localdomain ([49.203.40.145]) by mx.google.com with ESMTPSA id w8sm12007015pbt.71.2014.12.20.02.48.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 Dec 2014 02:48:19 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang Cc: LKML , adi-buildroot-devel@lists.sourceforge.net, Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH 04/15] media: blackfin: bfin_capture: improve buf_prepare() callback Date: Sat, 20 Dec 2014 16:17:31 +0530 Message-Id: <1419072462-3168-5-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 buf_prepare() callback. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/blackfin/bfin_capture.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index a997eac..8bd94a1 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -305,16 +305,12 @@ static int bcap_queue_setup(struct vb2_queue *vq, static int bcap_buffer_prepare(struct vb2_buffer *vb) { struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue); - struct bcap_buffer *buf = to_bcap_vb(vb); - unsigned long size; - size = bcap_dev->fmt.sizeimage; - if (vb2_plane_size(vb, 0) < size) { - v4l2_err(&bcap_dev->v4l2_dev, "buffer too small (%lu < %lu)\n", - vb2_plane_size(vb, 0), size); + vb2_set_plane_payload(vb, 0, bcap_dev->fmt.sizeimage); + if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) return -EINVAL; - } - vb2_set_plane_payload(&buf->vb, 0, size); + + vb->v4l2_buf.field = bcap_dev->fmt.field; return 0; }