2002-10-08 19:10:59

by Alan Cox

[permalink] [raw]
Subject: PATCH: fix ibmtr mapping bug

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.41/drivers/net/tokenring/ibmtr.c linux.2.5.41-ac1/drivers/net/tokenring/ibmtr.c
--- linux.2.5.41/drivers/net/tokenring/ibmtr.c 2002-07-20 20:11:25.000000000 +0100
+++ linux.2.5.41-ac1/drivers/net/tokenring/ibmtr.c 2002-10-06 22:05:10.000000000 +0100
@@ -243,7 +243,7 @@
static void __devinit find_turbo_adapters(int *iolist) {
int ram_addr;
int index=0;
- __u32 chanid;
+ void *chanid;
int found_turbo=0;
unsigned char *tchanid, ctemp;
int i,j;
@@ -300,7 +300,7 @@
printk("ibmtr::find_turbo_adapters, ibmtr card found at"
" %x but not a Turbo model\n",ram_addr);
#endif
- iounmap(ram_addr) ;
+ iounmap(ram_mapped) ;
} /* for */
for(i=0; i<IBMTR_MAX_ADAPTERS; i++) {
if(!turbo_io[i]) break;