Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / net / hp-plus.c

diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 4834314..0d7a625 100644 (file)
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -138,12 +138,6 @@ static int __init do_hpp_probe(struct net_device *dev)
        return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-       /* NB: hpp_close() handles free_irq */
-       release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
-}
-
 #ifndef MODULE
 struct net_device * __init hp_plus_probe(int unit)
 {
@@ -159,12 +153,7 @@ struct net_device * __init hp_plus_probe(int unit)
        err = do_hpp_probe(dev);
        if (err)
                goto out;
-       err = register_netdev(dev);
-       if (err)
-               goto out1;
        return dev;
-out1:
-       cleanup_card(dev);
 out:
        free_netdev(dev);
        return ERR_PTR(err);
@@ -261,6 +250,12 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
                ei_status.block_output = &hpp_mem_block_output;
                ei_status.get_8390_hdr = &hpp_mem_get_8390_hdr;
                dev->mem_start = mem_start;
+               ei_status.mem = ioremap(mem_start,
+                                       (HP_STOP_PG - HP_START_PG)*256);
+               if (!ei_status.mem) {
+                       retval = -ENOMEM;
+                       goto out;
+               }
                ei_status.rmem_start = dev->mem_start + TX_PAGES/2*256;
                dev->mem_end = ei_status.rmem_end
                        = dev->mem_start + (HP_STOP_PG - HP_START_PG)*256;
@@ -271,7 +266,12 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
        /* Leave the 8390 and HP chip reset. */
        outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);
 
+       retval = register_netdev(dev);
+       if (retval)
+               goto out1;
        return 0;
+out1:
+       iounmap(ei_status.mem);
 out:
        release_region(ioaddr, HP_IO_EXTENT);
        return retval;
@@ -380,7 +380,7 @@ hpp_mem_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring
 
        outw((ring_page<<8), ioaddr + HPP_IN_ADDR);
        outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-       isa_memcpy_fromio(hdr, dev->mem_start, sizeof(struct e8390_pkt_hdr));
+       memcpy_fromio(hdr, ei_status.mem, sizeof(struct e8390_pkt_hdr));
        outw(option_reg, ioaddr + HPP_OPTION);
        hdr->count = (le16_to_cpu(hdr->count) + 3) & ~3;        /* Round up allocation. */
 }
@@ -399,7 +399,7 @@ hpp_mem_block_input(struct net_device *dev, int count, struct sk_buff *skb, int
           Also note that we *can't* use eth_io_copy_and_sum() because
           it will not always copy "count" bytes (e.g. padded IP).  */
 
-       isa_memcpy_fromio(skb->data, dev->mem_start, count);
+       memcpy_fromio(skb->data, ei_status.mem, count);
        outw(option_reg, ioaddr + HPP_OPTION);
 }
 
@@ -424,7 +424,7 @@ hpp_mem_block_output(struct net_device *dev, int count,
 
        outw(start_page << 8, ioaddr + HPP_OUT_ADDR);
        outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-       isa_memcpy_toio(dev->mem_start, buf, (count + 3) & ~3);
+       memcpy_toio(ei_status.mem, buf, (count + 3) & ~3);
        outw(option_reg, ioaddr + HPP_OPTION);
 
        return;
@@ -463,11 +463,8 @@ init_module(void)
                dev->irq = irq[this_dev];
                dev->base_addr = io[this_dev];
                if (do_hpp_probe(dev) == 0) {
-                       if (register_netdev(dev) == 0) {
-                               dev_hpp[found++] = dev;
-                               continue;
-                       }
-                       cleanup_card(dev);
+                       dev_hpp[found++] = dev;
+                       continue;
                }
                free_netdev(dev);
                printk(KERN_WARNING "hp-plus.c: No HP-Plus card found (i/o = 0x%x).\n", io[this_dev]);
@@ -478,6 +475,13 @@ init_module(void)
        return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+       /* NB: hpp_close() handles free_irq */
+       iounmap(ei_status.mem);
+       release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
+}
+
 void
 cleanup_module(void)
 {