From patchwork Thu Jan 3 11:06:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Debski X-Patchwork-Id: 1926941 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7AB0EDFABD for ; Thu, 3 Jan 2013 11:06:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140Ab3ACLGV (ORCPT ); Thu, 3 Jan 2013 06:06:21 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:31192 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811Ab3ACLGU (ORCPT ); Thu, 3 Jan 2013 06:06:20 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MG100IIAQU8WUX0@mailout1.samsung.com> for linux-media@vger.kernel.org; Thu, 03 Jan 2013 20:06:19 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-aa-50e5662b4281 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9A.B1.12699.B2665E05; Thu, 03 Jan 2013 20:06:19 +0900 (KST) Received: from amdc1342.digital.local ([106.116.147.39]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MG100FOEQU7KHB0@mmp1.samsung.com> for linux-media@vger.kernel.org; Thu, 03 Jan 2013 20:06:19 +0900 (KST) From: Kamil Debski To: linux-media@vger.kernel.org Cc: jtp.park@samsung.com, arun.kk@samsung.com, s.nawrocki@samsung.com, Kamil Debski , Kyungmin Park Subject: [PATCH 2/3 RESEND] s5p-mfc: Correct check of vb2_dma_contig_init_ctx return value Date: Thu, 03 Jan 2013 12:06:03 +0100 Message-id: <1357211164-27443-2-git-send-email-k.debski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1357211164-27443-1-git-send-email-k.debski@samsung.com> References: <1357211164-27443-1-git-send-email-k.debski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDJMWRmVeSWpSXmKPExsVy+t9jAV3ttKcBBqvucVn0bNjK6sDo8XmT XABjFJdNSmpOZllqkb5dAlfGqYceBQs4Kj6tk2lg7GTvYuTgkBAwkejeK9vFyAlkiklcuLee rYuRi0NIYBGjxMoZf9ghnBVMEuufdDKBNLAJaEqsuucB0iAiIC/xpPcGWAOzwHRGibbOX+wg CWGBGInG/yvZQGwWAVWJa39uMYL08gq4SHx+nQaxV0FiziQbEJNTwFViyhIJkGIhoIJPfx6z TWDkXcDIsIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMj2M/PpHcwrmqwOMQowMGoxMPLWP8k QIg1say4MvcQowQHs5II7/UcoBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFexlNAKYH0xJLU7NTU gtQimCwTB6dUA2N+wdJNef25hlN8g7+bb15vfrvp2ffFllyKTzTXfZzbYSpY7jPZMYLNjSmn TZrBO7HrolhjXbGAWa5Pj8YvE3nT/rNmcbl5oZWHhaLjfdrLdYS646Oru57xLLvO/PnGtdTY /W2WTw9w1Ujd4P9nE3usU80z4f0r4Qn/3izquW65p+eCXOcnJZbijERDLeai4kQAagSrXe8B AAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org vb2_dma_contig_init_ctx returns an error if failed, NULL check is not necessary. Signed-off-by: Kamil Debski Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 3c35be7..927bdc3 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1096,12 +1096,12 @@ static int s5p_mfc_probe(struct platform_device *pdev) } dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); - if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) { + if (IS_ERR(dev->alloc_ctx[0])) { ret = PTR_ERR(dev->alloc_ctx[0]); goto err_res; } dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); - if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) { + if (IS_ERR(dev->alloc_ctx[1])) { ret = PTR_ERR(dev->alloc_ctx[1]); goto err_mem_init_ctx_1; }