From patchwork Thu Mar 10 12:28:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 624421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2ACTNke003550 for ; Thu, 10 Mar 2011 12:29:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791Ab1CJM3V (ORCPT ); Thu, 10 Mar 2011 07:29:21 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:37666 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197Ab1CJM3V (ORCPT ); Thu, 10 Mar 2011 07:29:21 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from eu_spt1 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0LHU008CWDCVKP80@mailout4.w1.samsung.com> for linux-media@vger.kernel.org; Thu, 10 Mar 2011 12:29:19 +0000 (GMT) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LHU000J2DCUHB@spt1.w1.samsung.com> for linux-media@vger.kernel.org; Thu, 10 Mar 2011 12:29:18 +0000 (GMT) Received: from localhost.localdomain (unknown [106.116.38.10]) by linux.samsung.com (Postfix) with ESMTP id 09B5627005F; Thu, 10 Mar 2011 13:30:15 +0100 (CET) Date: Thu, 10 Mar 2011 13:28:40 +0100 From: Marek Szyprowski Subject: [PATCH 1/3] v4l2: vb2: one more fix for REQBUFS() In-reply-to: <1299760122-29493-1-git-send-email-m.szyprowski@samsung.com> To: linux-media@vger.kernel.org Cc: m.szyprowski@samsung.com, kyungmin.park@samsung.com, andrzej.p@samsung.com, pawel@osciak.com Message-id: <1299760122-29493-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.2.3 References: <1299760122-29493-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Mar 2011 12:29:23 +0000 (UTC) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index c5f99c7..9df484d 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -488,6 +488,13 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) return -EINVAL; } + /* + * If the same number of buffers and memory access method is requested + * then return immedietely. + */ + if (q->memory == req->memory && req->count == q->num_buffers) + return 0; + if (req->count == 0 || q->num_buffers != 0 || q->memory != req->memory) { /* * We already have buffers allocated, so first check if they