From 08d6eee19e277ecc3cdef47f82de6c2b22c2478c Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 27 Jan 2011 15:49:06 +0000
Subject: [PATCH] --- yaml --- r: 232675 b: refs/heads/master c:
 0e6d8cad448bde3d846961bb43db15daae94562e h: refs/heads/master i:   232673:
 b4fdbd8fcb1e34a1f441d9860d54ac0b1d2801de   232671:
 a0477103f054b391e95218514361ca65e1ad5fa3 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-omap2/dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4048cc0384f..a2d2ed5f5a79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afb7d7099e27f30caf69b3ce80a4cb86612a0b87
+refs/heads/master: 0e6d8cad448bde3d846961bb43db15daae94562e
diff --git a/trunk/arch/arm/mach-omap2/dma.c b/trunk/arch/arm/mach-omap2/dma.c
index d2f15f5cfd36..34922b2d2e3f 100644
--- a/trunk/arch/arm/mach-omap2/dma.c
+++ b/trunk/arch/arm/mach-omap2/dma.c
@@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
 	if (IS_ERR(od)) {
 		pr_err("%s: Cant build omap_device for %s:%s.\n",
 			__func__, name, oh->name);
-		return IS_ERR(od);
+		return PTR_ERR(od);
 	}
 
 	mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);