| Message ID | 1478013963-28871-4-git-send-email-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-01-11 at 15:26:03 UTC, Johan Hovold wrote: > Make sure to drop any device reference taken by vio_find_node() when > adding and removing virtual I/O slots. > > Fixes: 5eeb8c63a38f ("[PATCH] PCI Hotplug: rpaphp: Move VIO...") > Signed-off-by: Johan Hovold <johan@kernel.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/99e5cde5eae78bef95bfe7c16ccda8 cheers
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index dc67f39779ec..c614ff7c3bc3 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -257,8 +257,13 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn) static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn) { - if (vio_find_node(dn)) + struct vio_dev *vio_dev; + + vio_dev = vio_find_node(dn); + if (vio_dev) { + put_device(&vio_dev->dev); return -EINVAL; + } if (!vio_register_device_node(dn)) { printk(KERN_ERR @@ -334,6 +339,9 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn) return -EINVAL; vio_unregister_device(vio_dev); + + put_device(&vio_dev->dev); + return 0; }
Make sure to drop any device reference taken by vio_find_node() when adding and removing virtual I/O slots. Fixes: 5eeb8c63a38f ("[PATCH] PCI Hotplug: rpaphp: Move VIO...") Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/pci/hotplug/rpadlpar_core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)