Skip to content

Commit

Permalink
[SPARC64]: Fix of_ioremap().
Browse files Browse the repository at this point in the history
Use request_mem_region() if IORESOURCE_MEM.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Oct 20, 2006
1 parent e83f214 commit 6bda573
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion arch/sparc64/kernel/of_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6bda573

Please sign in to comment.