openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Slaby 2008-01-29 22:49:16 +01:00 committed by David S. Miller
parent 1145d954a5
commit 915e91d734
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/e100.c
View File

@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
if(restart_required) { if(restart_required) {
// ack the rnr? // 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); e100_start_receiver(nic, nic->rx_to_clean);
if(work_done) if(work_done)
(*work_done)++; (*work_done)++;
@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
struct nic *nic = netdev_priv(netdev); struct nic *nic = netdev_priv(netdev);
unregister_netdev(netdev); unregister_netdev(netdev);
e100_free(nic); e100_free(nic);
iounmap(nic->csr); pci_iounmap(pdev, nic->csr);
free_netdev(netdev); free_netdev(netdev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);