Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / pci / hotplug / rpadlpar_core.c

diff --git a/kernel/drivers/pci/hotplug/rpadlpar_core.c b/kernel/drivers/pci/hotplug/rpadlpar_core.c
index e12bafd..f2fcbe9 100644 (file)
--- a/kernel/drivers/pci/hotplug/rpadlpar_core.c
+++ b/kernel/drivers/pci/hotplug/rpadlpar_core.c
@@ -258,8 +258,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
@@ -335,6 +340,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;
 }