To modify Ixia port numbers and IP in pod.yaml

[kvmfornfv.git] / kernel / drivers / bus / vexpress-config.c

diff --git a/kernel/drivers/bus/vexpress-config.c b/kernel/drivers/bus/vexpress-config.c
index a64763b..27ea64f 100644 (file)
--- a/kernel/drivers/bus/vexpress-config.c
+++ b/kernel/drivers/bus/vexpress-config.c
@@ -107,7 +107,7 @@ struct regmap *devm_regmap_init_vexpress_config(struct device *dev)
        if (!res)
                return ERR_PTR(-ENOMEM);
 
-       regmap = bridge->ops->regmap_init(dev, bridge->context);
+       regmap = (bridge->ops->regmap_init)(dev, bridge->context);
        if (IS_ERR(regmap)) {
                devres_free(res);
                return regmap;
@@ -171,6 +171,7 @@ static int vexpress_config_populate(struct device_node *node)
 {
        struct device_node *bridge;
        struct device *parent;
+       int ret;
 
        bridge = of_parse_phandle(node, "arm,vexpress,config-bridge", 0);
        if (!bridge)
@@ -181,7 +182,11 @@ static int vexpress_config_populate(struct device_node *node)
        if (WARN_ON(!parent))
                return -ENODEV;
 
-       return of_platform_populate(node, NULL, NULL, parent);
+       ret = of_platform_populate(node, NULL, NULL, parent);
+
+       put_device(parent);
+
+       return ret;
 }
 
 static int __init vexpress_config_init(void)