drm/bridge-connector: Fix bridge in drm_connector_hdmi_audio_init()

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.chen@rock-chips.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tested-by: Stephan Gerhold <stephan.gerhold@linaro.org>
Link: https://lore.kernel.org/r/20250620011616.118-1-kernel@airkyi.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index 7d2e499ea5dec2f710c1c67323bf9e6b177d3c9e..262e93e07a280481e7a6e79e7ff1147a2a2559e3 100644 (file)
--- 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,