From: Chaoyi Chen <chaoyi.c...@rock-chips.com>

The bridge used in drm_connector_hdmi_audio_init() does not correctly
point to the required audio bridge, which lead to incorrect audio
configuration input.

Fixes: 231adeda9f67 ("drm/bridge-connector: hook DisplayPort audio support")
Signed-off-by: Chaoyi Chen <chaoyi.c...@rock-chips.com>
---
 drivers/gpu/drm/display/drm_bridge_connector.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c 
b/drivers/gpu/drm/display/drm_bridge_connector.c
index 7d2e499ea5de..262e93e07a28 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -708,11 +708,14 @@ struct drm_connector *drm_bridge_connector_init(struct 
drm_device *drm,
        if (bridge_connector->bridge_hdmi_audio ||
            bridge_connector->bridge_dp_audio) {
                struct device *dev;
+               struct drm_bridge *bridge;
 
                if (bridge_connector->bridge_hdmi_audio)
-                       dev = 
bridge_connector->bridge_hdmi_audio->hdmi_audio_dev;
+                       bridge = bridge_connector->bridge_hdmi_audio;
                else
-                       dev = bridge_connector->bridge_dp_audio->hdmi_audio_dev;
+                       bridge = bridge_connector->bridge_dp_audio;
+
+               dev = bridge->hdmi_audio_dev;
 
                ret = drm_connector_hdmi_audio_init(connector, dev,
                                                    
&drm_bridge_connector_hdmi_audio_funcs,
-- 
2.49.0

Reply via email to