Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / drivers / gpu / drm / sti / sti_compositor.c

diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index 794148ff0e5755339f8a6a1bdfdac643b6d87e1f..134201ecc6fd98b65f286c0dd6f1135e04aaabc6 100644 (file)
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -254,12 +254,12 @@ static int sti_compositor_probe(struct platform_device *pdev)
        }
 
        /* Get reset resources */
-       compo->rst_main = devm_reset_control_get(dev, "compo-main");
+       compo->rst_main = devm_reset_control_get_shared(dev, "compo-main");
        /* Take compo main out of reset */
        if (!IS_ERR(compo->rst_main))
                reset_control_deassert(compo->rst_main);
 
-       compo->rst_aux = devm_reset_control_get(dev, "compo-aux");
+       compo->rst_aux = devm_reset_control_get_shared(dev, "compo-aux");
        /* Take compo aux out of reset */
        if (!IS_ERR(compo->rst_aux))
                reset_control_deassert(compo->rst_aux);
@@ -267,10 +267,12 @@ static int sti_compositor_probe(struct platform_device *pdev)
        vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0);
        if (vtg_np)
                compo->vtg_main = of_vtg_find(vtg_np);
+       of_node_put(vtg_np);
 
        vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 1);
        if (vtg_np)
                compo->vtg_aux = of_vtg_find(vtg_np);
+       of_node_put(vtg_np);
 
        platform_set_drvdata(pdev, compo);