From: Jiri Slaby <jirislaby@gmail.com>
Date: Tue, 29 Jan 2008 21:49:16 +0000 (+0100)
Subject: Net: e100, fix iomap mem accesses
X-Git-Tag: v2.6.25-rc1~1065^2~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=915e91d734d33ad303313e05582769dbbefff3b2;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 51cf577035b..9d42dd8f402 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);