From patchwork Wed Nov 14 17:22:37 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andy Gross <andy.gross@ti.com>
X-Patchwork-Id: 1743021
Return-Path: 
 <dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org>
X-Original-To: patchwork-dri-devel@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork2.kernel.org
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by patchwork2.kernel.org (Postfix) with ESMTP id 96D6DDF264
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Wed, 14 Nov 2012 17:22:51 +0000 (UTC)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 69F09A028E
	for <patchwork-dri-devel@patchwork.kernel.org>;
	Wed, 14 Nov 2012 09:22:51 -0800 (PST)
X-Original-To: dri-devel@lists.freedesktop.org
Delivered-To: dri-devel@lists.freedesktop.org
Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41])
	by gabe.freedesktop.org (Postfix) with ESMTP id 3F6889E815
	for <dri-devel@lists.freedesktop.org>;
	Wed, 14 Nov 2012 09:22:40 -0800 (PST)
Received: from dlelxv30.itg.ti.com ([172.17.2.17])
	by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id qAEHMbRx016780;
	Wed, 14 Nov 2012 11:22:37 -0600
Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110])
	by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAEHMbDD013291;
	Wed, 14 Nov 2012 11:22:37 -0600
Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle73.ent.ti.com
	(128.247.5.110) with Microsoft SMTP Server id 14.1.323.3;
	Wed, 14 Nov 2012 11:22:37 -0600
Received: from legion.dal.design.ti.com (legion.dal.design.ti.com
	[128.247.22.53])	by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id
	qAEHMbT2029426;	Wed, 14 Nov 2012 11:22:37 -0600
Received: from localhost (lta0273185-ubuntu1-128247075044.am.dhcp.ti.com
	[128.247.75.44])	by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7)
	with ESMTP id qAEHMaw04986;	Wed, 14 Nov 2012 11:22:36 -0600 (CST)
From: Andy Gross <andy.gross@ti.com>
To: <dri-devel@lists.freedesktop.org>
Subject: [PATCH v2] drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR
Date: Wed, 14 Nov 2012 11:22:37 -0600
Message-ID: <1352913757-8406-1-git-send-email-andy.gross@ti.com>
X-Mailer: git-send-email 1.7.5.4
MIME-Version: 1.0
Cc: Greg Kroah-Hartman <greg@kroah.com>, Rob Clark <rob@ti.com>
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
	<dri-devel.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org

Return -ENOMEM if dmm_txn_init cannot allocate a refill engine.

v2: Fix typing issue seen with newer compilers

Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Rob Clark <rob@ti.com
---
 drivers/staging/omapdrm/omap_dmm_tiler.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
index 3ae3955..1499521 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -279,7 +279,7 @@ static int fill(struct tcm_area *area, struct page **pages,
 
 	txn = dmm_txn_init(omap_dmm, area->tcm);
 	if (IS_ERR_OR_NULL(txn))
-		return PTR_ERR(txn);
+		return -ENOMEM;
 
 	tcm_for_each_slice(slice, *area, area_s) {
 		struct pat_area p_area = {