From 7c1ab83f3872bc752748d2575e9bc51d0b5ff789 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Mon, 27 Jun 2005 16:29:02 -0700 Subject: [PATCH] --- yaml --- r: 3821 b: refs/heads/master c: b6d00f0de9e932e2884b3b7af8e43c0a61a271ee h: refs/heads/master i: 3819: 4e7c6668b7bc46b214c856f211eb1eaa136b891b v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/rsrc_nonstatic.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dcfa18801120..ed6fb35d1aea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3248ff43f86493368b321376d447d84fa9a2737d +refs/heads/master: b6d00f0de9e932e2884b3b7af8e43c0a61a271ee diff --git a/trunk/drivers/pcmcia/rsrc_nonstatic.c b/trunk/drivers/pcmcia/rsrc_nonstatic.c index 51aa04b7ecc9..c42455d20eb6 100644 --- a/trunk/drivers/pcmcia/rsrc_nonstatic.c +++ b/trunk/drivers/pcmcia/rsrc_nonstatic.c @@ -779,6 +779,17 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) if (!s->cb_dev || !s->cb_dev->bus) return -ENODEV; +#if defined(CONFIG_X86) || defined(CONFIG_X86_64) + /* If this is the root bus, the risk of hitting + * some strange system devices which aren't protected + * by either ACPI resource tables or properly requested + * resources is too big. Therefore, don't do auto-adding + * of resources at the moment. + */ + if (s->cb_dev->bus->number == 0) + return -EINVAL; +#endif + for (i=0; i < PCI_BUS_NUM_RESOURCES; i++) { res = s->cb_dev->bus->resource[i]; if (!res)