From ff760405824d0bafa8ff72a9f57a45ac267fc1ab Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 2 Aug 2010 16:08:43 -0700 Subject: [PATCH] --- yaml --- r: 204011 b: refs/heads/master c: a3f2279ea06d8521c2d7abb0f6c0f48c7f5a6508 h: refs/heads/master i: 204009: de7b253c41fc8c79f1e96a9d78f68aff4dde8d26 204007: 5a52865093142a65e58ecf04eb30be806654b19c v: v3 --- [refs] | 2 +- trunk/drivers/net/hp100.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c1e39c6a315..6919bf4afc5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9292d8f20ff3c034c99c2adfe27496957b3defe3 +refs/heads/master: a3f2279ea06d8521c2d7abb0f6c0f48c7f5a6508 diff --git a/trunk/drivers/net/hp100.c b/trunk/drivers/net/hp100.c index acbf0d003a6d..ce587f4c4203 100644 --- a/trunk/drivers/net/hp100.c +++ b/trunk/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 @@ 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: