git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virtio_pci: defer kfree until release callback
[pandora-kernel.git]
/
drivers
/
virtio
/
virtio_pci.c
diff --git
a/drivers/virtio/virtio_pci.c
b/drivers/virtio/virtio_pci.c
index
03d1984
..
65c907d
100644
(file)
--- a/
drivers/virtio/virtio_pci.c
+++ b/
drivers/virtio/virtio_pci.c
@@
-612,11
+612,10
@@
static struct virtio_config_ops virtio_pci_config_ops = {
static void virtio_pci_release_dev(struct device *_d)
{
static void virtio_pci_release_dev(struct device *_d)
{
- /*
- * No need for a release method as we allocate/free
- * all devices together with the pci devices.
- * Provide an empty one to avoid getting a warning from core.
- */
+ struct virtio_device *vdev = dev_to_virtio(_d);
+ struct virtio_pci_device *vp_dev = to_vp_device(vdev);
+
+ kfree(vp_dev);
}
/* the PCI probing function */
}
/* the PCI probing function */
@@
-704,7
+703,6
@@
static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
pci_iounmap(pci_dev, vp_dev->ioaddr);
pci_release_regions(pci_dev);
pci_disable_device(pci_dev);
pci_iounmap(pci_dev, vp_dev->ioaddr);
pci_release_regions(pci_dev);
pci_disable_device(pci_dev);
- kfree(vp_dev);
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM