---

yaml --- r: 321620 b: refs/heads/master c: 959f724 h: refs/heads/master v: v3
git-mirror · Aug 8, 2012 · db6e347 · db6e347
1 parent 94a3435
commit db6e347
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)) {