1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 6f1588aa9071..6048b6b2a8c7 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -67,6 +67,8 @@ void hdmi_destroy(struct kref *kref)
         if (hdmi->i2c)
                 hdmi_i2c_destroy(hdmi->i2c);
 
+        platform_set_drvdata(hdmi->pdev, NULL);
+
         put_device(&hdmi->pdev->dev);
 }
 
@@ -102,6 +104,8 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder)
         hdmi->config = config;
         hdmi->encoder = encoder;
 
+        hdmi_audio_infoframe_init(&hdmi->audio.infoframe);
+
         /* not sure about which phy maps to which msm.. probably I miss some */
         if (config->phy_init)
                 hdmi->phy = config->phy_init(hdmi);
@@ -228,6 +232,8 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder)
         priv->bridges[priv->num_bridges++]       = hdmi->bridge;
         priv->connectors[priv->num_connectors++] = hdmi->connector;
 
+        platform_set_drvdata(pdev, hdmi);
+
         return hdmi;
 
 fail:
@@ -305,7 +311,7 @@ static int hdmi_dev_probe(struct platform_device *pdev)
                 config.ddc_data_gpio = 71;
                 config.hpd_gpio      = 72;
                 config.mux_en_gpio   = -1;
-                config.mux_sel_gpio  = 13 + NR_GPIO_IRQS;
+                config.mux_sel_gpio  = -1;
         } else if (cpu_is_msm8960() || cpu_is_msm8960ab()) {
                 static const char *hpd_reg_names[] = {"8921_hdmi_mvs"};
                 config.phy_init      = hdmi_phy_8960_init;