From patchwork Mon Nov 10 12:49:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 5265941 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 AE729C11AE for ; Mon, 10 Nov 2014 12:49:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1CBC20179 for ; Mon, 10 Nov 2014 12:49:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB4B12017E for ; Mon, 10 Nov 2014 12:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752731AbaKJMto (ORCPT ); Mon, 10 Nov 2014 07:49:44 -0500 Received: from lb3-smtp-cloud6.xs4all.net ([194.109.24.31]:48405 "EHLO lb3-smtp-cloud6.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbaKJMtm (ORCPT ); Mon, 10 Nov 2014 07:49:42 -0500 Received: from tschai.lan ([173.38.208.170]) by smtp-cloud6.xs4all.net with ESMTP id Dopd1p00R3h7Shp01opgvw; Mon, 10 Nov 2014 13:49:40 +0100 Received: from tschai.cisco.com (localhost [127.0.0.1]) by tschai.lan (Postfix) with ESMTPSA id 6F1142A13BD; Mon, 10 Nov 2014 13:49:33 +0100 (CET) From: Hans Verkuil To: linux-media@vger.kernel.org Cc: m.szyprowski@samsung.com, pawel@osciak.com, Hans Verkuil Subject: [RFCv6 PATCH 13/16] videobuf2-dvb.c: convert to vb2_plane_begin_cpu_access() Date: Mon, 10 Nov 2014 13:49:28 +0100 Message-Id: <1415623771-29634-14-git-send-email-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1415623771-29634-1-git-send-email-hverkuil@xs4all.nl> References: <1415623771-29634-1-git-send-email-hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 From: Hans Verkuil Signed-off-by: Hans Verkuil --- drivers/media/v4l2-core/videobuf2-dvb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-dvb.c b/drivers/media/v4l2-core/videobuf2-dvb.c index d092698..d954bb8 100644 --- a/drivers/media/v4l2-core/videobuf2-dvb.c +++ b/drivers/media/v4l2-core/videobuf2-dvb.c @@ -30,9 +30,12 @@ MODULE_LICENSE("GPL"); static int dvb_fnc(struct vb2_buffer *vb, void *priv) { struct vb2_dvb *dvb = priv; + void *p = vb2_plane_begin_cpu_access(vb, 0); - dvb_dmx_swfilter(&dvb->demux, vb2_plane_vaddr(vb, 0), - vb2_get_plane_payload(vb, 0)); + if (p == NULL) + return -ENOMEM; + dvb_dmx_swfilter(&dvb->demux, p, vb2_get_plane_payload(vb, 0)); + vb2_plane_end_cpu_access(vb, 0); return 0; }