Re: [PATCH] fix pcmcia errors

Paul Mackerras (paulus@samba.org)
Fri, 7 Dec 2001 12:10:20 +1100 (EST)


Marcelo Tosatti writes:

> As David commented, you're using PCI code unconditionally.
>
> Could you please fix that ?

Sure, here is a new patch against 2.4.17-pre5. I tried compiling this
up on an intel box with CONFIG_PCI = n and CONFIG_PCMCIA = y and it
compiled OK. The only change from my last patch is the addition of
#ifdef CONFIG_PCI around the bit that does the
pci_find_parent_resource call.

Thanks,
Paul.

diff -urN linux-2.4.17-pre5/drivers/pcmcia/rsrc_mgr.c pmac/drivers/pcmcia/rsrc_mgr.c
--- linux-2.4.17-pre5/drivers/pcmcia/rsrc_mgr.c Fri Dec 7 07:55:31 2001
+++ pmac/drivers/pcmcia/rsrc_mgr.c Fri Dec 7 08:55:24 2001
@@ -107,17 +107,21 @@
static struct resource *resource_parent(unsigned long b, unsigned long n,
int flags, struct pci_dev *dev)
{
- struct resource res;
+#ifdef CONFIG_PCI
+ struct resource res, *pr;

- if (dev == NULL) {
- if (flags & IORESOURCE_MEM)
- return &iomem_resource;
- return &ioport_resource;
+ if (dev != NULL) {
+ res.start = b;
+ res.end = b + n - 1;
+ res.flags = flags;
+ pr = pci_find_parent_resource(dev, &res);
+ if (pr)
+ return pr;
}
- res.start = b;
- res.end = b + n - 1;
- res.flags = flags;
- return pci_find_parent_resource(dev, &res);
+#endif /* CONFIG_PCI */
+ if (flags & IORESOURCE_MEM)
+ return &iomem_resource;
+ return &ioport_resource;
}

static inline int check_io_resource(unsigned long b, unsigned long n,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/