From bd081fc70bea63fa1a06a17d6f2f969ff14567dd Mon Sep 17 00:00:00 2001 From: Aaron Sierra Date: Thu, 14 Feb 2013 11:35:04 -0600 Subject: [PATCH] --- yaml --- r: 357679 b: refs/heads/master c: ff7109fa632654eaef657186f2942f5b679023d6 h: refs/heads/master i: 357677: e073b748f235a842c36273b25a575f870e8e541b 357675: f230148b051dbf757907b373ef6fd9f3c5441fa1 357671: d99aa2a4f4360157a4da16a17bc8ea80664ffb2b 357663: 957b55ccc45d45380ae809d9d70e7b675c3b7219 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/lpc_ich.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 412413ff714c..abb6a60fbd24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ec3090cf14ec0920a5fbe976b5aafd6084db435 +refs/heads/master: ff7109fa632654eaef657186f2942f5b679023d6 diff --git a/trunk/drivers/mfd/lpc_ich.c b/trunk/drivers/mfd/lpc_ich.c index 5c2ef41fa24c..9f12f91d6296 100644 --- a/trunk/drivers/mfd/lpc_ich.c +++ b/trunk/drivers/mfd/lpc_ich.c @@ -916,7 +916,8 @@ static int lpc_ich_probe(struct pci_dev *dev, int ret; bool cell_added = false; - priv = kmalloc(GFP_KERNEL, sizeof(struct lpc_ich_priv)); + priv = devm_kzalloc(&dev->dev, + sizeof(struct lpc_ich_priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -952,7 +953,6 @@ static int lpc_ich_probe(struct pci_dev *dev, dev_warn(&dev->dev, "No MFD cells added\n"); lpc_ich_restore_config_space(dev); pci_set_drvdata(dev, NULL); - kfree(priv); return -ENODEV; } @@ -961,12 +961,9 @@ static int lpc_ich_probe(struct pci_dev *dev, static void lpc_ich_remove(struct pci_dev *dev) { - void *priv = pci_get_drvdata(dev); - mfd_remove_devices(&dev->dev); lpc_ich_restore_config_space(dev); pci_set_drvdata(dev, NULL); - kfree(priv); } static struct pci_driver lpc_ich_driver = {