From 8960c10d95a24005d16b7830d6091d39b68fac52 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Tue, 8 Jun 2010 07:48:11 -0600 Subject: [PATCH] --- yaml --- r: 204894 b: refs/heads/master c: 3930f294d081c9e2a65f137a7d5fb6c161e4aa94 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/of/address.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 404c9eb99b9b..e0b775e64441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 154063a9c03d31228b6f9366d2ffc2b7c4961698 +refs/heads/master: 3930f294d081c9e2a65f137a7d5fb6c161e4aa94 diff --git a/trunk/drivers/of/address.c b/trunk/drivers/of/address.c index 0b04137f04f7..5c220c3a3acc 100644 --- a/trunk/drivers/of/address.c +++ b/trunk/drivers/of/address.c @@ -346,12 +346,21 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * a 1:1 translation at that level. It's up to the caller not to try * to translate addresses that aren't supposed to be translated in * the first place. --BenH. + * + * As far as we know, this damage only exists on Apple machines, so + * This code is only enabled on powerpc. --gcl */ ranges = of_get_property(parent, rprop, &rlen); +#if !defined(CONFIG_PPC) + if (ranges == NULL) { + pr_err("OF: no ranges; cannot translate\n"); + return 1; + } +#endif /* !defined(CONFIG_PPC) */ if (ranges == NULL || rlen == 0) { offset = of_read_number(addr, na); memset(addr, 0, pna * 4); - pr_debug("OF: no ranges, 1:1 translation\n"); + pr_debug("OF: empty ranges; 1:1 translation\n"); goto finish; }