Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / hwtracing / coresight / of_coresight.c

diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index b68da1888fd515879a43df8f6173dd77cdb8754e..629e031b745651f136916d482506b953dc12597a 100644 (file)
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -166,7 +166,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
 
                        rdev = of_coresight_get_endpoint_device(rparent);
                        if (!rdev)
-                               continue;
+                               return ERR_PTR(-EPROBE_DEFER);
 
                        pdata->child_names[i] = dev_name(rdev);
                        pdata->child_ports[i] = rendpoint.id;
@@ -184,6 +184,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
                        break;
                }
        }
+       of_node_put(dn);
 
        return pdata;
 }