From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] hp100: unmap memory on error path Date: Fri, 30 Jul 2010 11:06:04 +0200 Message-ID: <20100730090604.GY26313@bicker> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "David S. Miller" , Jiri Pirko , Stephen Hemminger , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org To: Jaroslav Kysela Return-path: Received: from mail-ew0-f46.google.com ([209.85.215.46]:37043 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321Ab0G3JGg (ORCPT ); Fri, 30 Jul 2010 05:06:36 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: There was an error path where "mem_ptr_virt" didn't get unmapped. Signed-off-by: Dan Carpenter diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index acbf0d0..ce587f4 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -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); @@ -798,6 +799,7 @@ out3: 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: