linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: LMML <linux-media@vger.kernel.org>,
	Scott Jiang <scott.jiang.linux@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	adi-buildroot-devel@lists.sourceforge.net,
	Mauro Carvalho Chehab <m.chehab@samsung.com>,
	"Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Subject: [PATCH 04/15] media: blackfin: bfin_capture: improve buf_prepare() callback
Date: Sat, 20 Dec 2014 16:17:31 +0530	[thread overview]
Message-ID: <1419072462-3168-5-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1419072462-3168-1-git-send-email-prabhakar.csengg@gmail.com>

this patch improves the buf_prepare() callback.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
 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;
 }
-- 
1.9.1


  parent reply	other threads:[~2014-12-20 10:48 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-20 10:47 [PATCH 00/15] media: blackfin: bfin_capture enhancements Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 01/15] media: blackfin: bfin_capture: drop buf_init() callback Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 02/15] media: blackfin: bfin_capture: release buffers in case start_streaming() call back fails Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 03/15] media: blackfin: bfin_capture: set min_buffers_needed Lad, Prabhakar
2014-12-20 10:47 ` Lad, Prabhakar [this message]
2014-12-20 10:47 ` [PATCH 05/15] media: blackfin: bfin_capture: improve queue_setup() callback Lad, Prabhakar
2015-01-21 10:01   ` Scott Jiang
2015-01-21 11:29     ` Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 06/15] media: blackfin: bfin_capture: use vb2_fop_mmap/poll Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 07/15] media: blackfin: bfin_capture: use v4l2_fh_open and vb2_fop_release Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 08/15] media: blackfin: bfin_capture: use vb2_ioctl_* helpers Lad, Prabhakar
2015-01-21 10:55   ` Scott Jiang
2015-01-21 11:28     ` Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 09/15] media: blackfin: bfin_capture: make sure all buffers are returned on stop_streaming() callback Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 10/15] media: blackfin: bfin_capture: return -ENODATA for *std calls Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 11/15] media: blackfin: bfin_capture: return -ENODATA for *dv_timings calls Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 12/15] media: blackfin: bfin_capture: add support for vidioc_create_bufs Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 13/15] media: blackfin: bfin_capture: add support for VB2_DMABUF Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 14/15] media: blackfin: bfin_capture: add support for VIDIOC_EXPBUF Lad, Prabhakar
2014-12-20 10:47 ` [PATCH 15/15] media: blackfin: bfin_capture: set v4l2 buffer sequence Lad, Prabhakar
2014-12-26  7:13 ` [PATCH 00/15] media: blackfin: bfin_capture enhancements Scott Jiang
2015-01-16 15:08   ` Hans Verkuil
2015-01-21 12:09 ` Lad, Prabhakar
2015-01-22  3:51   ` Scott Jiang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419072462-3168-5-git-send-email-prabhakar.csengg@gmail.com \
    --to=prabhakar.csengg@gmail.com \
    --cc=adi-buildroot-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=scott.jiang.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).