From c73cade21011db2444bfe9f054f1555bbb9dc48e Mon Sep 17 00:00:00 2001
From: Rob Clark <rob@ti.com>
Date: Wed, 21 Mar 2012 16:40:23 -0500
Subject: [PATCH] --- yaml --- r: 304256 b: refs/heads/master c:
 1c3a4dc3d01547103a81957d41f105d462f42c4d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0bfe8d69bd69..b2ec4df0059f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a75f3f1aeae099388f63e4cec3ad08aff8e7da
+refs/heads/master: 1c3a4dc3d01547103a81957d41f105d462f42c4d
diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
index 1ecb6a73d790..9d83060e753a 100644
--- a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -347,7 +347,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,
 	ret = tcm_reserve_2d(containers[fmt], w, h, align, &block->area);
 	if (ret) {
 		kfree(block);
-		return 0;
+		return ERR_PTR(-ENOMEM);
 	}
 
 	/* add to allocation list */
@@ -371,7 +371,7 @@ struct tiler_block *tiler_reserve_1d(size_t size)
 	if (tcm_reserve_1d(containers[TILFMT_PAGE], num_pages,
 				&block->area)) {
 		kfree(block);
-		return 0;
+		return ERR_PTR(-ENOMEM);
 	}
 
 	spin_lock(&omap_dmm->list_lock);