aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2016-11-01 11:26:03 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-12 05:39:37 -0500
commitb3539f813578419c6b386a669405284df5c5950d (patch)
tree7d22461dffe664c05129f9ab1f8f29fb0a948749
parent1aaa777ec0095f66d9717d07c224b374fbb5f08a (diff)
powerpc/pci/rpadlpar: Fix device reference leaks
commit 99e5cde5eae78bef95bfe7c16ccda87fb070149b upstream. 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 registration") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pci/hotplug/rpadlpar_core.c10
1 files changed, 9 insertions, 1 deletions
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)
257 257
258static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn) 258static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn)
259{ 259{
260 if (vio_find_node(dn)) 260 struct vio_dev *vio_dev;
261
262 vio_dev = vio_find_node(dn);
263 if (vio_dev) {
264 put_device(&vio_dev->dev);
261 return -EINVAL; 265 return -EINVAL;
266 }
262 267
263 if (!vio_register_device_node(dn)) { 268 if (!vio_register_device_node(dn)) {
264 printk(KERN_ERR 269 printk(KERN_ERR
@@ -334,6 +339,9 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn)
334 return -EINVAL; 339 return -EINVAL;
335 340
336 vio_unregister_device(vio_dev); 341 vio_unregister_device(vio_dev);
342
343 put_device(&vio_dev->dev);
344
337 return 0; 345 return 0;
338} 346}
339 347