Messages in this thread | | | Date | Wed, 30 Jan 2008 08:28:32 -0800 | From | "Kok, Auke" <> | Subject | Re: [PATCH 1/1] Net: e100, fix iomap mem accesses |
| |
Jiri Slaby wrote: > 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> > --- > drivers/net/e100.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/e100.c b/drivers/net/e100.c > index 51cf577..47548ef 100644 > --- a/drivers/net/e100.c > +++ b/drivers/net/e100.c > @@ -1904,7 +1904,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, rx_to_start); > if(work_done) > (*work_done)++; > @@ -2706,7 +2706,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);
Acked-By: Auke Kok <auke-jan.h.kok@intel.com>
Jeff, feel free to merge in upstream-fixes.
Cheers,
Auke
| |