From 2fd99863fb565e93d9fc570281800c83bd9e4737 Mon Sep 17 00:00:00 2001
From: Andy Gross <andy.gross@ti.com>
Date: Tue, 13 Nov 2012 15:41:32 -0600
Subject: [PATCH] --- yaml --- r: 337892 b: refs/heads/master c:
 743815ae1bbd2790321a3ab1f23abb82c1fdd45b 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 121d9aead8da..1fc02c9a5b76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be3c5126b553cc807d112a5010a10f8e5bee5427
+refs/heads/master: 743815ae1bbd2790321a3ab1f23abb82c1fdd45b
diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
index 4d138df369b3..5c809c056859 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(txn);
+		return PTR_ERR(-ENOMEM);
 
 	tcm_for_each_slice(slice, *area, area_s) {
 		struct pat_area p_area = {