From patchwork Tue Nov 13 21:41:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 1736581 Return-Path: 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 4DF94DF280 for ; Tue, 13 Nov 2012 21:45:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11F649F632 for ; Tue, 13 Nov 2012 13:45:18 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by gabe.freedesktop.org (Postfix) with ESMTP id 02FB69F5F5 for ; Tue, 13 Nov 2012 13:41:54 -0800 (PST) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id qADLfqjd030633; Tue, 13 Nov 2012 15:41:52 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qADLfqHl016805; Tue, 13 Nov 2012 15:41:52 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 13 Nov 2012 15:41:52 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id qADLfqXg023510; Tue, 13 Nov 2012 15:41:52 -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 qADLfpw18368; Tue, 13 Nov 2012 15:41:51 -0600 (CST) From: Andy Gross To: Subject: [PATCH] drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR Date: Tue, 13 Nov 2012 15:41:32 -0600 Message-ID: <1352842892-2810-1-git-send-email-andy.gross@ti.com> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 Cc: Rob Clark , Greg Kroah-Hartman X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 PTR_ERR(-ENOMEM) if dmm_txn_init cannot allocate a refill engine. Signed-off-by: Andy Gross Signed-off-by: Rob Clark --- 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..1a5a7ca 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 PTR_ERR(-ENOMEM); tcm_for_each_slice(slice, *area, area_s) { struct pat_area p_area = {