From 82ed2054665a2c6caa7b7a69143583e051289812 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 31 Jul 2014 08:33:33 +0200
Subject: resource: Let __request_region return an error pointer

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/memory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/memory.c')

diff --git a/common/memory.c b/common/memory.c
index 4a8fe283f2..c56455002a 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -22,6 +22,7 @@
 #include <of.h>
 #include <init.h>
 #include <linux/ioport.h>
+#include <linux/err.h>
 #include <asm-generic/memory_layout.h>
 #include <asm/sections.h>
 #include <malloc.h>
@@ -150,7 +151,7 @@ struct resource *request_sdram_region(const char *name, resource_size_t start,
 
 		res = __request_region(bank->res, name, start,
 				       start + size - 1);
-		if (res)
+		if (!IS_ERR(res))
 			return res;
 	}
 
-- 
cgit v1.2.3