• Stephan Gerhold's avatar
    ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack() · 2a0435df
    Stephan Gerhold authored
    Sound is broken on the DragonBoard 410c (apq8016_sbc) since 5.10:
    
      hdmi-audio-codec hdmi-audio-codec.1.auto: ASoC: error at snd_soc_component_set_jack on hdmi-audio-codec.1.auto: -95
      qcom-apq8016-sbc 7702000.sound: Failed to set jack: -95
      ADV7533: ASoC: error at snd_soc_link_init on ADV7533: -95
      hdmi-audio-codec hdmi-audio-codec.1.auto: ASoC: error at snd_soc_component_set_jack on hdmi-audio-codec.1.auto: -95
      qcom-apq8016-sbc: probe of 7702000.sound failed with error -95
    
    This happens because apq8016_sbc calls snd_soc_component_set_jack() on
    all codec DAIs and attempts to ignore failures with return code -ENOTSUPP.
    -ENOTSUPP is also excluded from error logging in soc_component_ret().
    
    However, hdmi_codec_set_jack() returns -E*OP*NOTSUPP if jack detection
    is not supported, which is not handled in apq8016_sbc and soc_component_ret().
    Make it return -ENOTSUPP instead to fix sound and silence the errors.
    
    Cc: Cheng-Yi Chiang <cychiang@chromium.org>
    Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Fixes: 55c5cc63 ("ASoC: hdmi-codec: Use set_jack ops to set jack")
    Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
    Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
    Link: https://lore.kernel.org/r/20210107165131.2535-1-stephan@gerhold.netSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    2a0435df
hdmi-codec.c 25.6 KB