From patchwork Thu Jan 22 22:18:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5688931 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 E23C8C058D for ; Thu, 22 Jan 2015 22:21:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13C362026F for ; Thu, 22 Jan 2015 22:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F32C20272 for ; Thu, 22 Jan 2015 22:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754240AbbAVWVE (ORCPT ); Thu, 22 Jan 2015 17:21:04 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:59290 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753718AbbAVWUt (ORCPT ); Thu, 22 Jan 2015 17:20:49 -0500 Received: by mail-wg0-f51.google.com with SMTP id l18so4317768wgh.10; Thu, 22 Jan 2015 14:20:47 -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=bIgXU1glc+0erBmrNS/us8tSUg4amD1+5bRYw+QY5g8=; b=VLbczuVcq8oWs3wXgiN0BuNKfdbT46D9xsnVdooyJo9ghBTsCQ+SoTPqGCukDjxsnG gX+o+i4b6OHlZuu5bPUvJOBBRjIo0I9HndB/yaMYAeryTbEs/7hUtnHb2GDaVjcTx1xJ Yp//rtrBj3u9Jlx7bnzAWRjG087Wy+f8KIZdy2GBm+Xj9Qq0EsXtzlw+NwJDo+vqjfFb SfP41uQ2umy+AS12zzUf+6t29lMlYM9Ejx6L6GHyp3x3I66yZ6cOLE/oLImWFVd+ghHs 7oH5iUQX5OSHSIdsyhlKFgMHzStIuLm+vIwRTsodbCyJpP3nn/I/tEEUdPm2DgkQszmY xweg== X-Received: by 10.194.94.227 with SMTP id df3mr7928326wjb.34.1421965247688; Thu, 22 Jan 2015 14:20:47 -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.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 14:20:46 -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 04/15] media: blackfin: bfin_capture: improve buf_prepare() callback Date: Thu, 22 Jan 2015 22:18:37 +0000 Message-Id: <1421965128-10470-5-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 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; }