ARM64: DTS: Fix Firefly board audio driver

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / panel / panel-simple.c

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 211f331b7a7d0a6e2f8aa97105eaf8d62c0a379e..6b113f66dcaf63c4243a3959ba2e11fa3b4d90ce 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -436,11 +436,7 @@ static int panel_simple_prepare(struct drm_panel *panel)
        if (p->desc && p->desc->delay.init)
                msleep(p->desc->delay.init);
 
-       if (p->on_cmds) {
-               err = panel_simple_dsi_send_cmds(p, p->on_cmds);
-               if (err)
-                       dev_err(p->dev, "failed to send on cmds\n");
-       }
+
 
        p->prepared = true;
 
@@ -450,6 +446,7 @@ static int panel_simple_prepare(struct drm_panel *panel)
 static int panel_simple_enable(struct drm_panel *panel)
 {
        struct panel_simple *p = to_panel_simple(panel);
+       int err;
 
        if (p->enabled)
                return 0;
@@ -457,6 +454,12 @@ static int panel_simple_enable(struct drm_panel *panel)
        if (p->desc && p->desc->delay.enable)
                msleep(p->desc->delay.enable);
 
+       if (p->on_cmds) {
+               err = panel_simple_dsi_send_cmds(p, p->on_cmds);
+               if (err)
+                       dev_err(p->dev, "failed to send on cmds\n");
+       }
+
        if (p->backlight) {
                p->backlight->props.power = FB_BLANK_UNBLANK;
                backlight_update_status(p->backlight);