GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-03 13:04:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mfd: lpc_ich: Use devres API to allocate private data

Browse source 
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>
This commit is contained in:
Aaron Sierra 2013-02-14 11:35:04 -06:00 • committed by Samuel Ortiz
parent 3ec3090cf1
commit ff7109fa63
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/mfd/lpc_ich.c
View file

@ -916,7 +916,8 @@ static int lpc_ich_probe(struct pci_dev *dev,
int ret; int ret;
bool cell_added = false; 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) if (!priv)
return -ENOMEM; return -ENOMEM;
@ -952,7 +953,6 @@ static int lpc_ich_probe(struct pci_dev *dev,
dev_warn(&dev->dev, "No MFD cells added\n"); dev_warn(&dev->dev, "No MFD cells added\n");
lpc_ich_restore_config_space(dev); lpc_ich_restore_config_space(dev);
pci_set_drvdata(dev, NULL); pci_set_drvdata(dev, NULL);
kfree(priv);
return -ENODEV; return -ENODEV;
} }
@ -961,12 +961,9 @@ static int lpc_ich_probe(struct pci_dev *dev,
static void lpc_ich_remove(struct pci_dev *dev) static void lpc_ich_remove(struct pci_dev *dev)
{ {
void *priv = pci_get_drvdata(dev);
mfd_remove_devices(&dev->dev); mfd_remove_devices(&dev->dev);
lpc_ich_restore_config_space(dev); lpc_ich_restore_config_space(dev);
pci_set_drvdata(dev, NULL); pci_set_drvdata(dev, NULL);
kfree(priv);
} }
static struct pci_driver lpc_ich_driver = { static struct pci_driver lpc_ich_driver = {