Re: Linux 2.4.25-rc4

Hilko Bengen
2004-02-19T23:32:27Z

Marcelo Tosatti <marcelo.tosatti@cyclades.com> writes:

>> Ok, the bug has been there for ages and, being an ISA card, the
>> I-Surf is probably not used that much any more... Was there
>> anything wrong with the patch I sent?
>
> I dont think so. I will be in 2.4.26-pre1

Thanks.

There was also another patch which I posted earlier to this list.

It fixes an issue with iomem being displayed wrong in /proc/isapnp
output. I found this when trying to debug the isurf issue.

Please include that also.

-Hilko

diff -uir orig/linux-2.4.23/drivers/pnp/isapnp_proc.c linux-2.4.24/drivers/pnp/isapnp_proc.c
--- orig/linux-2.4.23/drivers/pnp/isapnp_proc.c 2002-11-29 00:53:14.000000000 +0100
+++ linux-2.4.24/drivers/pnp/isapnp_proc.c 2004-02-06 14:56:45.000000000 +0100
@@ -649,7 +649,7 @@
if (next)
isapnp_printf(buffer, "\n");
for (i = next = 0; i < 4; i++) {
- tmp = isapnp_read_dword(ISAPNP_CFG_MEM + (i << 3));
+ tmp = isapnp_read_word(ISAPNP_CFG_MEM + (i << 3)) << 8;
if (!tmp)
continue;
if (!next) {