From 1fe5064fdd6a9f16138f8b7cf8c3586df2da84f1 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sat, 13 Oct 2007 13:03:38 -0400 Subject: [PATCH] --- yaml --- r: 69326 b: refs/heads/master c: bc2618f7528d4b6ea0c2c53539a3b8cff2b33b24 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tehuti.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f2f362b7472..ef7dfdb42d88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e7b968a07022d6aa369b38b095570db241c7bea +refs/heads/master: bc2618f7528d4b6ea0c2c53539a3b8cff2b33b24 diff --git a/trunk/drivers/net/tehuti.c b/trunk/drivers/net/tehuti.c index 8d04654f0c59..4e1b84e6d66a 100644 --- a/trunk/drivers/net/tehuti.c +++ b/trunk/drivers/net/tehuti.c @@ -1906,7 +1906,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /************** pci *****************/ if ((err = pci_enable_device(pdev))) /* it trigers interrupt, dunno why. */ - RET(err); /* it's not a problem though */ + goto err_pci; /* it's not a problem though */ if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) && !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) { @@ -2076,6 +2076,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_release_regions(pdev); err_dma: pci_disable_device(pdev); +err_pci: vfree(nic); RET(err);