From 250b2eac2a407f2b2c30698c590b1e06c75e7e2b Mon Sep 17 00:00:00 2001 From: Hidetoshi Seto Date: Fri, 20 Aug 2010 04:25:00 -0300 Subject: [PATCH] --- yaml --- r: 217374 b: refs/heads/master c: 2aa9be448dab7433c685b634a4049289cb1913d3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 77456e2fb255..1c7f644963f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 848b2f7ed6db4d3a83201187159665cc57725d9f +refs/heads/master: 2aa9be448dab7433c685b634a4049289cb1913d3 diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index c4fa112271e5..e1cbbbad466e 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -470,6 +470,13 @@ static struct i7core_dev *alloc_i7core_dev(u8 socket, return i7core_dev; } +static void free_i7core_dev(struct i7core_dev *i7core_dev) +{ + list_del(&i7core_dev->list); + kfree(i7core_dev->pdev); + kfree(i7core_dev); +} + /**************************************************************************** Memory check routines ****************************************************************************/ @@ -1265,7 +1272,6 @@ static void i7core_put_devices(struct i7core_dev *i7core_dev) PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); pci_dev_put(pdev); } - kfree(i7core_dev->pdev); } static void i7core_put_all_devices(void) @@ -1274,8 +1280,7 @@ static void i7core_put_all_devices(void) list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) { i7core_put_devices(i7core_dev); - list_del(&i7core_dev->list); - kfree(i7core_dev); + free_i7core_dev(i7core_dev); } } @@ -2106,8 +2111,7 @@ static void __devexit i7core_remove(struct pci_dev *pdev) /* Release PCI resources */ i7core_put_devices(i7core_dev); - list_del(&i7core_dev->list); - kfree(i7core_dev); + free_i7core_dev(i7core_dev); } } probed--;