Skip to content
Snippets Groups Projects
  1. Jan 19, 2021
  2. Jan 18, 2021
  3. Jan 13, 2021
    • Stephan Gerhold's avatar
      ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack() · e2f02a85
      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.net
      
      
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Signed-off-by: default avatarAníbal Limón <anibal.limon@linaro.org>
      
      Conflicts:
      	sound/soc/fsl/imx-hdmi.c
      e2f02a85
  4. Jan 12, 2021
Loading