diff options
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index e7b001017b9a..32057e65808b 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -531,7 +531,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
| 531 | if (!time_after(jiffies, timeout)) continue; | 531 | if (!time_after(jiffies, timeout)) continue; |
| 532 | DPRINTK( "Hardware timeout during initialization.\n"); | 532 | DPRINTK( "Hardware timeout during initialization.\n"); |
| 533 | iounmap(t_mmio); | 533 | iounmap(t_mmio); |
| 534 | kfree(ti); | ||
| 535 | return -ENODEV; | 534 | return -ENODEV; |
| 536 | } | 535 | } |
| 537 | ti->sram_phys = | 536 | ti->sram_phys = |
| @@ -645,7 +644,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
| 645 | DPRINTK("Unknown shared ram paging info %01X\n", | 644 | DPRINTK("Unknown shared ram paging info %01X\n", |
| 646 | ti->shared_ram_paging); | 645 | ti->shared_ram_paging); |
| 647 | iounmap(t_mmio); | 646 | iounmap(t_mmio); |
| 648 | kfree(ti); | ||
| 649 | return -ENODEV; | 647 | return -ENODEV; |
| 650 | break; | 648 | break; |
| 651 | } /*end switch shared_ram_paging */ | 649 | } /*end switch shared_ram_paging */ |
| @@ -675,7 +673,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
| 675 | "driver limit (%05x), adapter not started.\n", | 673 | "driver limit (%05x), adapter not started.\n", |
| 676 | chk_base, ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE); | 674 | chk_base, ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE); |
| 677 | iounmap(t_mmio); | 675 | iounmap(t_mmio); |
| 678 | kfree(ti); | ||
| 679 | return -ENODEV; | 676 | return -ENODEV; |
| 680 | } else { /* seems cool, record what we have figured out */ | 677 | } else { /* seems cool, record what we have figured out */ |
| 681 | ti->sram_base = new_base >> 12; | 678 | ti->sram_base = new_base >> 12; |
| @@ -690,7 +687,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
| 690 | DPRINTK("Could not grab irq %d. Halting Token Ring driver.\n", | 687 | DPRINTK("Could not grab irq %d. Halting Token Ring driver.\n", |
| 691 | irq); | 688 | irq); |
| 692 | iounmap(t_mmio); | 689 | iounmap(t_mmio); |
| 693 | kfree(ti); | ||
| 694 | return -ENODEV; | 690 | return -ENODEV; |
| 695 | } | 691 | } |
| 696 | /*?? Now, allocate some of the PIO PORTs for this driver.. */ | 692 | /*?? Now, allocate some of the PIO PORTs for this driver.. */ |
| @@ -699,7 +695,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | |||
| 699 | DPRINTK("Could not grab PIO range. Halting driver.\n"); | 695 | DPRINTK("Could not grab PIO range. Halting driver.\n"); |
| 700 | free_irq(dev->irq, dev); | 696 | free_irq(dev->irq, dev); |
| 701 | iounmap(t_mmio); | 697 | iounmap(t_mmio); |
| 702 | kfree(ti); | ||
| 703 | return -EBUSY; | 698 | return -EBUSY; |
| 704 | } | 699 | } |
| 705 | 700 | ||
