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 bd74732ea09b0a0b97923138955913e5463bf91f..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);