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: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index c56a941..9de3f7c 100644 (file)
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -259,8 +259,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)
 {
 
 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;
                return -EINVAL;

+       }

 
        if (!vio_register_device_node(dn)) {
                printk(KERN_ERR
 
        if (!vio_register_device_node(dn)) {
                printk(KERN_ERR


@@ -336,6 +341,9 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn)
                return -EINVAL;
 
        vio_unregister_device(vio_dev);
                return -EINVAL;
 
        vio_unregister_device(vio_dev);

+
+       put_device(&vio_dev->dev);
+

        return 0;
 }
 
        return 0;
 }