From f3b9d13472ef4e63b564e53d2000a087df45f6a3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 18 Oct 2006 23:00:35 -0700 Subject: [PATCH] --- yaml --- r: 40062 b: refs/heads/master c: 6bda57365a5fda4743d83a5987c6aab66e90771c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/of_device.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 647da9a83a99..2402e6e3c489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e83f214e45a80459d2931ae1259ab5fae82c8a8e +refs/heads/master: 6bda57365a5fda4743d83a5987c6aab66e90771c diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c index d822c7c18e1f..d3dfb2a36d47 100644 --- a/trunk/arch/sparc64/kernel/of_device.c +++ b/trunk/arch/sparc64/kernel/of_device.c @@ -131,8 +131,13 @@ static int of_device_resume(struct device * dev) void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name) { unsigned long ret = res->start + offset; + struct resource *r; - if (!request_region(ret, size, name)) + if (res->flags & IORESOURCE_MEM) + r = request_mem_region(ret, size, name); + else + r = request_region(ret, size, name); + if (!r) ret = 0; return (void __iomem *) ret;