Skip to content

Commit

Permalink
mfd: lpc_ich: Use devres API to allocate private data
Browse files Browse the repository at this point in the history
And fix a kzalloc argument inversion bug while converting to devres.

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Aaron Sierra authored and Samuel Ortiz committed Feb 15, 2013
1 parent 3ec3090 commit ff7109f
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/mfd/lpc_ich.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand All @@ -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 = {
Expand Down

0 comments on commit ff7109f

Please sign in to comment.