From patchwork Sun Dec 2 10:18:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15762 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Tf6da-00041g-L8 for patchwork@linuxtv.org; Sun, 02 Dec 2012 11:19:02 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1Tf6dZ-00027z-II; Sun, 02 Dec 2012 11:19:02 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752487Ab2LBKSh (ORCPT ); Sun, 2 Dec 2012 05:18:37 -0500 Received: from mail-qa0-f53.google.com ([209.85.216.53]:64228 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808Ab2LBKSh (ORCPT ); Sun, 2 Dec 2012 05:18:37 -0500 Received: by mail-qa0-f53.google.com with SMTP id a19so611700qad.19 for ; Sun, 02 Dec 2012 02:18:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=ynzuokjNz35MS78yz/Q1Ogp794TZ0tz6C1k9hU/GO3Q=; b=eXkxbMTzAnOapKbf6IGgb3fc+fQ+yUJO/MOvXYVISfaEhV0RlWihIje52nlDHM49fc i+V1ny2J+PWZGqpnPbudJxH8mnnpVqVv+TwvOruWN73ie95YYAKLMrbctrTEx3x1CwW2 kbjk9iQ73QXYlx/CuX09veJauHcp4JLpE//ePSLfJVBORYtuWWBJ33ir6c5pdx1xXDir Jrfp3lFPGKfywye/zriqZ4y9tJWJ+iQrsbsH3W2j579vlBW67FUpmlghaNbBggMRR27Y czonxznhhwURDRHtcErnkFwOsYrykJy9vxQysAYFnOTok2sqi9mpJJbzh1qvMQzdc+fG 3IgA== MIME-Version: 1.0 Received: by 10.224.195.136 with SMTP id ec8mr11341873qab.98.1354443515437; Sun, 02 Dec 2012 02:18:35 -0800 (PST) Received: by 10.229.126.165 with HTTP; Sun, 2 Dec 2012 02:18:35 -0800 (PST) Date: Sun, 2 Dec 2012 05:18:35 -0500 Message-ID: Subject: [PATCH -next] [media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs() From: Wei Yongjun To: manjunath.hadli@ti.com, prabhakar.lad@ti.com, mchehab@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.12.2.101217 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun In case of error, the function vb2_dma_contig_init_ctx() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun Acked-by: Prabhakar Lad --- drivers/media/platform/davinci/vpbe_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 2bfde79..e181a52 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv, } /* Initialize videobuf queue as per the buffer type */ layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev); - if (!layer->alloc_ctx) { + if (IS_ERR(layer->alloc_ctx)) { v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n"); - return -EINVAL; + return PTR_ERR(layer->alloc_ctx); } q = &layer->buffer_queue; memset(q, 0, sizeof(*q));