aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2006-11-27 22:21:29 -0500
committerPaul Mackerras <paulus@samba.org>2006-12-04 04:41:49 -0500
commit4468f01dc7cfd1998845cd66a0cdb1f3ef9740f0 (patch)
treef931cb8cfc84b894063e4bc604efa1eacc1b79ee
parentede8edb35b95c78c890b15fdb6cedcb3f42f4769 (diff)
[POWERPC] Fix OF pci flags parsing
For PCI devices with only io ports, of_bus_pci_get_flags() will fall through and still mark the resource as IORESOURCE_MEM. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/prom_parse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 346fb7bf9a05..0dfbe1cd28eb 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -160,9 +160,11 @@ static unsigned int of_bus_pci_get_flags(const u32 *addr)
160 switch((w >> 24) & 0x03) { 160 switch((w >> 24) & 0x03) {
161 case 0x01: 161 case 0x01:
162 flags |= IORESOURCE_IO; 162 flags |= IORESOURCE_IO;
163 break;
163 case 0x02: /* 32 bits */ 164 case 0x02: /* 32 bits */
164 case 0x03: /* 64 bits */ 165 case 0x03: /* 64 bits */
165 flags |= IORESOURCE_MEM; 166 flags |= IORESOURCE_MEM;
167 break;
166 } 168 }
167 if (w & 0x40000000) 169 if (w & 0x40000000)
168 flags |= IORESOURCE_PREFETCH; 170 flags |= IORESOURCE_PREFETCH;