---

yaml --- r: 337986 b: refs/heads/master c: 295c799 h: refs/heads/master v: v3
git-mirror · Nov 16, 2012 · 2d93c35 · 2d93c35
1 parent e05def4
commit 2d93c35
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: 9d36976fad3008fcc4209789566f7f3e7763f212
+refs/heads/master: 295c799ae45b3678d9b8d3e845635ed07ce3b66a
diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -296,7 +296,7 @@ static int fill(struct tcm_area *area, struct page **pages,
 
 	txn = dmm_txn_init(omap_dmm, area->tcm);
 	if (IS_ERR_OR_NULL(txn))
-		return PTR_ERR(-ENOMEM);
+		return -ENOMEM;
 
 	tcm_for_each_slice(slice, *area, area_s) {
 		struct pat_area p_area = {