Skip to content

Commit

Permalink
hp100: unmap memory on error path
Browse files Browse the repository at this point in the history
There was an error path where "mem_ptr_virt" didn't get unmapped.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Aug 2, 2010
1 parent 9292d8f commit a3f2279
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/hp100.c
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,10 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
/* Conversion to new PCI API :
* Pages are always aligned and zeroed, no need to it ourself.
* Doc says should be OK for EISA bus as well - Jean II */
if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) {
lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr);
if (!lp->page_vaddr_algn) {
err = -ENOMEM;
goto out2;
goto out_mem_ptr;
}
lp->whatever_offset = ((u_long) page_baddr) - ((u_long) lp->page_vaddr_algn);

Expand Down Expand Up @@ -798,6 +799,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
pci_free_consistent(lp->pci_dev, MAX_RINGSIZE + 0x0f,
lp->page_vaddr_algn,
virt_to_whatever(dev, lp->page_vaddr_algn));
out_mem_ptr:
if (mem_ptr_virt)
iounmap(mem_ptr_virt);
out2:
Expand Down

0 comments on commit a3f2279

Please sign in to comment.