From db6e347ba037ed53d413c7ddf1084e2fc14b5d49 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 7 Aug 2012 06:57:25 +0000
Subject: [PATCH] --- yaml --- r: 321620 b: refs/heads/master c:
 959f724728b6a1cb5185230972119dd7bc8b610e h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/gpu/drm/udl/udl_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ce8fbe0e346..f0e1b50afca1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41494cbaeaed07a43e111b323d6da5e1d8dd7936
+refs/heads/master: 959f724728b6a1cb5185230972119dd7bc8b610e
diff --git a/trunk/drivers/gpu/drm/udl/udl_gem.c b/trunk/drivers/gpu/drm/udl/udl_gem.c
index 7bd65bdd15a8..291ecc145585 100644
--- a/trunk/drivers/gpu/drm/udl/udl_gem.c
+++ b/trunk/drivers/gpu/drm/udl/udl_gem.c
@@ -308,7 +308,7 @@ struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev,
 	/* need to attach */
 	attach = dma_buf_attach(dma_buf, dev->dev);
 	if (IS_ERR(attach))
-		return ERR_PTR(PTR_ERR(attach));
+		return ERR_CAST(attach);
 
 	sg = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
 	if (IS_ERR(sg)) {