Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 915e91d7 authored by Jiri Slaby's avatar Jiri Slaby Committed by David S. Miller
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1145d954

drivers/net/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -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);