Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c
index 6bf4ce466d20fc194e968098bf76cca1efa77d84..0bdc385eec178663b823df0b83c5ed2a320965e8 100644 (file)
--- a/drivers/gpu/drm/sti/sti_vtg.c
+++ b/drivers/gpu/drm/sti/sti_vtg.c
@@ -65,7 +65,7 @@
 #define HDMI_DELAY          (5)
 
 /* Delay introduced by the DVO in nb of pixel */
-#define DVO_DELAY           (2)
+#define DVO_DELAY           (7)
 
 /* delay introduced by the Arbitrary Waveform Generator in nb of pixels */
 #define AWG_DELAY_HD        (-9)
@@ -432,6 +432,7 @@ static int vtg_probe(struct platform_device *pdev)
        np = of_parse_phandle(pdev->dev.of_node, "st,slave", 0);
        if (np) {
                vtg->slave = of_vtg_find(np);
+               of_node_put(np);
 
                if (!vtg->slave)
                        return -EPROBE_DEFER;