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);
 }
 
 /**