patch-2.4.0-test3 linux/drivers/net/3c59x.c

• Lines: 22
• Date: Wed Jul 5 22:15:27 2000
• Orig file: v2.4.0-test2/linux/drivers/net/3c59x.c
• Orig date: Fri Jun 23 21:55:09 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/net/3c59x.c linux/drivers/net/3c59x.c
@@ -959,11 +959,11 @@
 #endif
 
 	if (pdev && vci->drv_flags & HAS_CB_FNS) {
-		u32 fn_st_addr;			/* Cardbus function status space */
+		unsigned long fn_st_addr;			/* Cardbus function status space */
 		fn_st_addr = pci_resource_start (pdev, 2);
 		if (fn_st_addr)
 			vp->cb_fn_base = ioremap(fn_st_addr, 128);
-		printk(KERN_INFO "%s: CardBus functions mapped %8.8x->%p\n",
+		printk(KERN_INFO "%s: CardBus functions mapped %8.8lx->%p\n",
 			   dev->name, fn_st_addr, vp->cb_fn_base);
 #if 1 /* AKPM: the 575_cb and 905B LEDs seem OK without this */
 		if (vortex_pci_tbl[chip_idx].device != 0x5257) {
@@ -1452,7 +1452,6 @@
 	mod_timer(&vp->timer, RUN_AT(next_tick));
 	if (vp->deferred)
 		outw(FakeIntr, ioaddr + EL3_CMD);
-	timer_exit(&vp->timer);
 	return;
 }