diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-01-29 16:49:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-03 07:27:55 -0500 |
commit | 915e91d734d33ad303313e05582769dbbefff3b2 (patch) | |
tree | d6c6b1936c1cbf11cb81d1bde73266fead44b0bc /drivers | |
parent | 1145d954a51df9362d7eaa2c68405fc226418f34 (diff) |
Net: e100, fix iomap mem accesses
Patch against netdev-2.6 follows.
--
writeX functions are not permitted on iomap-ped space change to iowriteX,
also pci_unmap pci_map-ped space on exit (instead of iounmap).
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 51cf577035be..9d42dd8f402e 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done, | |||
1958 | 1958 | ||
1959 | if(restart_required) { | 1959 | if(restart_required) { |
1960 | // ack the rnr? | 1960 | // ack the rnr? |
1961 | writeb(stat_ack_rnr, &nic->csr->scb.stat_ack); | 1961 | iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack); |
1962 | e100_start_receiver(nic, nic->rx_to_clean); | 1962 | e100_start_receiver(nic, nic->rx_to_clean); |
1963 | if(work_done) | 1963 | if(work_done) |
1964 | (*work_done)++; | 1964 | (*work_done)++; |
@@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev) | |||
2774 | struct nic *nic = netdev_priv(netdev); | 2774 | struct nic *nic = netdev_priv(netdev); |
2775 | unregister_netdev(netdev); | 2775 | unregister_netdev(netdev); |
2776 | e100_free(nic); | 2776 | e100_free(nic); |
2777 | iounmap(nic->csr); | 2777 | pci_iounmap(pdev, nic->csr); |
2778 | free_netdev(netdev); | 2778 | free_netdev(netdev); |
2779 | pci_release_regions(pdev); | 2779 | pci_release_regions(pdev); |
2780 | pci_disable_device(pdev); | 2780 | pci_disable_device(pdev); |