From 57b58666ce25da94a643f6c608d59d09272282d3 Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Wed, 21 Jun 2006 16:17:17 +0200 Subject: [PATCH] --- yaml --- r: 28839 b: refs/heads/master c: 6d56ab936237b429366ade0d2a1540c7e41beb87 h: refs/heads/master i: 28837: a19e91337171f006afb4adcaa12160907c18ae0b 28835: 58c85e224ed32682ad680bf49de55156d17f9dcd 28831: d747d9c9c50c54be8e295498a771dc33523c3957 v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/olympic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a4afe3e7f37..a0a669425b5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a192491ad58098f2c57d2d1efe721ea0634dc0aa +refs/heads/master: 6d56ab936237b429366ade0d2a1540c7e41beb87 diff --git a/trunk/drivers/net/tokenring/olympic.c b/trunk/drivers/net/tokenring/olympic.c index 23032a7bc0a9..c3cb8d26cfe3 100644 --- a/trunk/drivers/net/tokenring/olympic.c +++ b/trunk/drivers/net/tokenring/olympic.c @@ -217,7 +217,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device dev = alloc_trdev(sizeof(struct olympic_private)) ; if (!dev) { i = -ENOMEM; - goto op_free_dev; + goto op_release_dev; } olympic_priv = dev->priv ; @@ -282,8 +282,8 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device if (olympic_priv->olympic_lap) iounmap(olympic_priv->olympic_lap); -op_free_dev: free_netdev(dev); +op_release_dev: pci_release_regions(pdev); op_disable_dev: