From fdebf283eb5353c51967c28f5d7853bb7e2ea1c2 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Sun, 22 Jan 2012 18:27:21 +0100
Subject: [PATCH] --- yaml --- r: 289015 b: refs/heads/master c:
 37fe58ba6832de1df88f3734d8e18f6da6a06971 h: refs/heads/master i:   289013:
 d97cc8728a8e0e172ad99a17adf76eab0f3afdd5   289011:
 64d3004449299c83319a53378aa0bdeaad963502   289007:
 513ba819adb12cd3e45e65cb3545024f6c4918da v: v3

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

diff --git a/[refs] b/[refs]
index a6f4f04ad30a..566f5c3e8f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2f92ae6b986934ff220eda6b5c91f4ee294b35
+refs/heads/master: 37fe58ba6832de1df88f3734d8e18f6da6a06971
diff --git a/trunk/drivers/staging/omapdrm/omap_gem_helpers.c b/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
index 29275c7209e9..f895363a5e54 100644
--- a/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
+++ b/trunk/drivers/staging/omapdrm/omap_gem_helpers.c
@@ -84,7 +84,7 @@ struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
 		page_cache_release(pages[i]);
 	}
 	drm_free_large(pages);
-	return ERR_PTR(PTR_ERR(p));
+	return ERR_CAST(p);
 }
 
 /**