control: Fall back to old naming if ELD device name decoding fails

If ELD device name lookup fails, fall back to the old style naming
instead of disabling the HDMI output altogether.

Fixes: https://github.com/alsa-project/alsa-lib/issues/233
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
This commit is contained in:
Bernhard Rosenkränzer 2022-06-04 18:13:40 +02:00
parent d836146e91
commit ac1dca240a
2 changed files with 6 additions and 3 deletions

View file

@ -288,8 +288,10 @@ static int snd_ctl_hw_pcm_info(snd_ctl_t *handle, snd_pcm_info_t * info)
if (ioctl(hw->fd, SNDRV_CTL_IOCTL_PCM_INFO, info) < 0) if (ioctl(hw->fd, SNDRV_CTL_IOCTL_PCM_INFO, info) < 0)
return -errno; return -errno;
/* may be configurable (optional) */ /* may be configurable (optional) */
if (__snd_pcm_info_eld_fixup_check(info)) if (__snd_pcm_info_eld_fixup_check(info)) {
return __snd_pcm_info_eld_fixup(info); if (__snd_pcm_info_eld_fixup(info))
SYSMSG("ELD lookup failed, using old HDMI output names\n");
}
return 0; return 0;
} }

View file

@ -325,7 +325,8 @@ static int snd_pcm_hw_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
} }
/* may be configurable (optional) */ /* may be configurable (optional) */
if (__snd_pcm_info_eld_fixup_check(info)) if (__snd_pcm_info_eld_fixup_check(info))
return __snd_pcm_info_eld_fixup(info); if (__snd_pcm_info_eld_fixup(info))
SYSMSG("ELD lookup failed, using old HDMI output names\n");
return 0; return 0;
} }