From patchwork Mon Apr 29 09:24:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 2499101 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 57EAD3FD1A for ; Mon, 29 Apr 2013 09:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756875Ab3D2Jhx (ORCPT ); Mon, 29 Apr 2013 05:37:53 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:37587 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755678Ab3D2Jhx (ORCPT ); Mon, 29 Apr 2013 05:37:53 -0400 Received: by mail-pa0-f45.google.com with SMTP id lf10so3577365pab.18 for ; Mon, 29 Apr 2013 02:37:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=gTUMvatMIyuDhtQI9kOBlUF7q6cou88drkZxsdu/UgU=; b=gNcb067ZVcErNREs5FlTYhbYeuVJKNPkAN/SLEjPDI1KbZ5XVpW4KSjm2ZYufaltAU Vze9uFa4RGcVm48229a7irBmu7Z0LgDScgRyg+F5O+QPo/9FqfGlttVTLSatWhYZRFOH 5X79goB8KLf1Ru2TfvwSO4gBOS4OVD0PPU2G9FH7AtZydPLh0HdNrUpV0mITyGCIw599 3thH66vCkpVOx8FY8DpVKk+0tQqnLo8Kk52r51TP0XGOgXhSuwKD6RTL+8Jz4vwOgDx3 kHXemiLz0QHeLPTgR2/XLeYgtXbymfVSNaDBKt+IHd+B7p88mfPahROQVqsjAGjwdC7D gU+A== X-Received: by 10.68.137.168 with SMTP id qj8mr42685771pbb.17.1367228272531; Mon, 29 Apr 2013 02:37:52 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id br2sm23328203pbc.46.2013.04.29.02.37.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 02:37:52 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: t.stanislaws@samsung.com, s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 3/3] [media] s5p-tv: Fix incorrect usage of IS_ERR_OR_NULL in mixer_video.c Date: Mon, 29 Apr 2013 14:54:59 +0530 Message-Id: <1367227499-543-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367227499-543-1-git-send-email-sachin.kamat@linaro.org> References: <1367227499-543-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQmx45dg9qEFqqlL1yRsP1UXVU3PRb0pCY1+ZwIogSufxIrBvN3/N5bSvliwfzRVh0Vqj/cJ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org vb2_dma_contig_init_ctx does not return NULL. Use IS_ERR() instead. Signed-off-by: Sachin Kamat --- drivers/media/platform/s5p-tv/mixer_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index ef0efdf..25319de 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -81,7 +81,7 @@ int mxr_acquire_video(struct mxr_device *mdev, } mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev); - if (IS_ERR_OR_NULL(mdev->alloc_ctx)) { + if (IS_ERR(mdev->alloc_ctx)) { mxr_err(mdev, "could not acquire vb2 allocator\n"); goto fail_v4l2_dev; }