]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/pci/rpadlpar: Fix device reference leaks
authorJohan Hovold <johan@kernel.org>
Tue, 1 Nov 2016 15:26:03 +0000 (16:26 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 14 Nov 2016 09:05:59 +0000 (20:05 +1100)
Make sure to drop any device reference taken by vio_find_node() when
adding and removing virtual I/O slots.

Fixes: bba35adc5665 ("[PATCH] PCI Hotplug: rpaphp: Move VIO registration")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/pci/hotplug/rpadlpar_core.c

index dc67f39779ecd3cbfbd7d0f60eaafc627e85e2d2..c614ff7c3bc3f9b28a0c48cd4c1c236899477606 100644 (file)
@@ -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;
 }