Re: [PATCH] PnP Updates for 2.6.4-mm2

[Adam Belay <ambx1@neo.rr.com>]

[ISAPNP] MEM Config Fix

This patch fixes a bug in the resource configuration function.  If there is
more than one memory range, the isapnp driver will write into the incorrect
configuration register.  I'm in the process of rewritting the configuration
code, but I think it's better to send this now rather than waiting to send
it all at once.

--- a/drivers/pnp/isapnp/core.c	2004-03-14 23:09:29.000000000 +0000
+++ b/drivers/pnp/isapnp/core.c	2004-03-14 23:08:46.000000000 +0000
@@ -1048,7 +1048,7 @@
 	for (tmp = 0; tmp < PNP_MAX_DMA && (res->dma_resource[tmp].flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA; tmp++)
 		isapnp_write_byte(ISAPNP_CFG_DMA+tmp, res->dma_resource[tmp].start);
 	for (tmp = 0; tmp < PNP_MAX_MEM && (res->mem_resource[tmp].flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM; tmp++)
-		isapnp_write_word(ISAPNP_CFG_MEM+(tmp<<2), (res->mem_resource[tmp].start >> 8) & 0xffff);
+		isapnp_write_word(ISAPNP_CFG_MEM+(tmp<<3), (res->mem_resource[tmp].start >> 8) & 0xffff);
 	/* FIXME: We aren't handling 32bit mems properly here */
 	isapnp_activate(dev->number);
 	isapnp_cfg_end();