diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-01-29 22:49:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-03 04:27:55 -0800 |
| commit | 915e91d734d33ad303313e05582769dbbefff3b2 (patch) | |
| tree | d6c6b1936c1cbf11cb81d1bde73266fead44b0bc /drivers/net/e100.c | |
| parent | 1145d954a51df9362d7eaa2c68405fc226418f34 (diff) | |
| download | linux-stable-915e91d734d33ad303313e05582769dbbefff3b2.tar.gz linux-stable-915e91d734d33ad303313e05582769dbbefff3b2.tar.bz2 linux-stable-915e91d734d33ad303313e05582769dbbefff3b2.zip | |
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/net/e100.c')
| -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, if(restart_required) { // ack the rnr? - writeb(stat_ack_rnr, &nic->csr->scb.stat_ack); + iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack); e100_start_receiver(nic, nic->rx_to_clean); if(work_done) (*work_done)++; @@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev) struct nic *nic = netdev_priv(netdev); unregister_netdev(netdev); e100_free(nic); - iounmap(nic->csr); + pci_iounmap(pdev, nic->csr); free_netdev(netdev); pci_release_regions(pdev); pci_disable_device(pdev); |