summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-26 10:40:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-26 10:40:10 -0700
commit26aad69e3dd854abe9028ca873fb40b410a39dd7 (patch)
tree0f9b4d31027e8cfeb26c9d391f9f27e2f0bfcedf
parent9c2c38a122cc23d6a09b8004d60a33913683eedf (diff)
downloadop-kernel-dev-26aad69e3dd854abe9028ca873fb40b410a39dd7.zip
op-kernel-dev-26aad69e3dd854abe9028ca873fb40b410a39dd7.tar.gz
Only pre-allocate 256 bytes of cardbio IO range
It may seem small, but most cards need much less, if any, and this not only makes the code adhere to the comment, it seems to fix a boot-time lockup on a ThinkPad 380XD laptop reported by Tero Roponen <teanropo@cc.jyu.fi> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/pci/setup-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index a2eebc6..6d864c5 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -40,7 +40,7 @@
* FIXME: IO should be max 256 bytes. However, since we may
* have a P2P bridge below a cardbus bridge, we need 4K.
*/
-#define CARDBUS_IO_SIZE (4096)
+#define CARDBUS_IO_SIZE (256)
#define CARDBUS_MEM_SIZE (32*1024*1024)
static void __devinit
OpenPOWER on IntegriCloud