patch-2.1.126 linux/drivers/net/sdlamain.c

• Lines: 23
• Date: Fri Oct 9 11:56:59 1998
• Orig file: v2.1.125/linux/drivers/net/sdlamain.c
• Orig date: Sat Sep 5 16:46:40 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/net/sdlamain.c linux/drivers/net/sdlamain.c
@@ -269,9 +269,9 @@
 	card->hw.irq     = (conf->irq == 9) ? 2 : conf->irq;
 	/* Compute the virtual address of the card in kernel space */
 	if(conf->maddr)
-		card->hw.dpmbase = (unsigned long)phys_to_virt(conf->maddr);
+		card->hw.dpmbase = phys_to_virt(conf->maddr);
 	else	/* But 0 means NULL */
-		card->hw.dpmbase = conf->maddr;
+		card->hw.dpmbase = (void *)conf->maddr;
 
 	card->hw.dpmsize = SDLA_WINDOWSIZE;
 	card->hw.type    = conf->hw_opt[0];
@@ -470,8 +470,8 @@
 		}
 		/* FIXME::: COPY TO KERNEL BUFFER FIRST ?? */
 		sti();	/* Not ideal but tough we have to do this */
-		if(copy_to_user((void*)(dump.ptr),
-			(void*)(card->hw.dpmbase + pos), len))	
+		if(copy_to_user((void *)dump.ptr,
+			(u8 *)card->hw.dpmbase + pos, len))	
 			return -EFAULT;
 		cli();
 		dump.length     -= len;