From patchwork Wed Mar 23 10:01:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 654861 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 p2NA16ZL011505 for ; Wed, 23 Mar 2011 10:01:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978Ab1CWKBM (ORCPT ); Wed, 23 Mar 2011 06:01:12 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:58092 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751899Ab1CWKBL (ORCPT ); Wed, 23 Mar 2011 06:01:11 -0400 Received: from axis700.grange (pD9EB90DE.dip0.t-ipconnect.de [217.235.144.222]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LaYSx-1Pb1460T9D-00mFox; Wed, 23 Mar 2011 11:01:09 +0100 Received: by axis700.grange (Postfix, from userid 1000) id CEAB4189B86; Wed, 23 Mar 2011 11:01:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id CC664189B85 for ; Wed, 23 Mar 2011 11:01:08 +0100 (CET) Date: Wed, 23 Mar 2011 11:01:08 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH] V4L: fix videobof2 to correctly identify allocation failures Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:g5TiL4bvz9cznpx3Hto95ekJAHH/2ggxtvNAB7eBdbO pbVbpmFw9cUISWK31Vbwkje8es97jL2f4YoHZdA0wrLT0iaEm9 tdhH+9YTfaS8N4D6cEVGvDXomNr4XNXn3l0q8tKMTiUlBJ3/Mc JIf/V+kqT0hvevjxeqKbk4D6JY+5P4EVkBKKQ6M6fMwH116ebU kkB4IWDoktEvxFdrqC50fV9zcsDqAZN14igThAZp04= 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]); Wed, 23 Mar 2011 10:01:26 +0000 (UTC) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 6698c77..71734a4 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -51,7 +51,7 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb, for (plane = 0; plane < vb->num_planes; ++plane) { mem_priv = call_memop(q, plane, alloc, q->alloc_ctx[plane], plane_sizes[plane]); - if (!mem_priv) + if (IS_ERR_OR_NULL(mem_priv)) goto free; /* Associate allocator private data with this plane */