1 diff -urN -X dontdiff linux-2.6.0-test9.vanilla/drivers/net/pcmcia/ibmtr_cs.c linux-2.6.0-test9/drivers/net/pcmcia/ibmtr_cs.c
2 --- linux-2.6.0-test9.vanilla/drivers/net/pcmcia/ibmtr_cs.c 2003-10-25 14:43:42.000000000 -0400
3 +++ linux-2.6.0-test9/drivers/net/pcmcia/ibmtr_cs.c 2003-10-25 19:01:02.000000000 -0400
5 struct net_device *dev;
7 window_handle_t sram_win_handle;
12 static void netdev_get_drvinfo(struct net_device *dev,
14 DEBUG(0, "ibmtr_attach()\n");
16 /* Create new token-ring device */
17 - dev = alloc_trdev(sizeof(*info));
21 + info = kmalloc(sizeof(*info), GFP_KERNEL);
22 + if (!info) return NULL;
23 + memset(info,0,sizeof(*info));
24 + dev = alloc_trdev(sizeof(struct tok_info));
33 + info->ti = dev->priv;
35 link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
36 link->io.NumPorts1 = 4;
37 link->io.IOAddrLines = 16;
40 unregister_netdev(dev);
45 /*======================================================================
46 diff -urN -X dontdiff linux-2.6.0-test9.vanilla/drivers/net/tokenring/ibmtr.c linux-2.6.0-test9/drivers/net/tokenring/ibmtr.c
47 --- linux-2.6.0-test9.vanilla/drivers/net/tokenring/ibmtr.c 2003-10-25 14:43:58.000000000 -0400
48 +++ linux-2.6.0-test9/drivers/net/tokenring/ibmtr.c 2003-10-25 17:26:38.000000000 -0400
51 /* this allows displaying full adapter information */
53 -char *channel_def[] __initdata = { "ISA", "MCA", "ISA P&P" };
54 +char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };
56 static char pcchannelid[] __devinitdata = {
57 0x05, 0x00, 0x04, 0x09,
59 ti->sram_virt &= ~1; /* to reverse what we do in tok_close */
60 /* init the spinlock */
61 ti->lock = (spinlock_t) SPIN_LOCK_UNLOCKED;
63 + init_timer(&ti->tr_timer);
65 i = tok_init_card(dev);
70 /* Important for PCMCIA hot unplug, otherwise, we'll pull the card, */
71 /* unloading the module from memory, and then if a timer pops, ouch */
72 - del_timer(&ti->tr_timer);
73 + del_timer_sync(&ti->tr_timer);
74 outb(0, dev->base_addr + ADAPTRESET);
76 ti->open_status = CLOSED;