From 2d93c350218ffd11a35623f841516afc322800a4 Mon Sep 17 00:00:00 2001
From: Andy Gross <andy.gross@ti.com>
Date: Fri, 16 Nov 2012 13:10:57 -0600
Subject: [PATCH] --- yaml --- r: 337986 b: refs/heads/master c:
 295c799ae45b3678d9b8d3e845635ed07ce3b66a h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/omapdrm/omap_dmm_tiler.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38360e5b2e50..bb926312e48d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d36976fad3008fcc4209789566f7f3e7763f212
+refs/heads/master: 295c799ae45b3678d9b8d3e845635ed07ce3b66a
diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
index 5c809c056859..59bf43899fc0 100644
--- a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -296,7 +296,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(-ENOMEM);
+		return -ENOMEM;
 
 	tcm_for_each_slice(slice, *area, area_s) {
 		struct pat_area p_area = {