diff options
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_drm_eld.c | 2 | ||||
| -rw-r--r-- | sound/core/rawmidi.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c index 688eefce82fa..cb2eebaac85f 100644 --- a/sound/core/pcm_drm_eld.c +++ b/sound/core/pcm_drm_eld.c @@ -379,7 +379,7 @@ int snd_parse_eld(struct device *dev, struct snd_parsed_hdmi_eld *e, * in console or for audio devices. Assume the highest speakers * configuration, to _not_ prohibit multi-channel audio playback. */ - if (!e->spk_alloc) + if (!e->spk_alloc && e->sad_count) e->spk_alloc = 0xffff; return 0; diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 20d36a346cca..8969ee2757f1 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -2106,13 +2106,11 @@ EXPORT_SYMBOL(snd_rawmidi_set_ops); static int __init alsa_rawmidi_init(void) { - snd_ctl_register_ioctl(snd_rawmidi_control_ioctl); snd_ctl_register_ioctl_compat(snd_rawmidi_control_ioctl); #ifdef CONFIG_SND_OSSEMUL - { int i; /* check device map table */ - for (i = 0; i < SNDRV_CARDS; i++) { + for (int i = 0; i < SNDRV_CARDS; i++) { if (midi_map[i] < 0 || midi_map[i] >= SNDRV_RAWMIDI_DEVICES) { pr_err("ALSA: rawmidi: invalid midi_map[%d] = %d\n", i, midi_map[i]); @@ -2124,7 +2122,6 @@ static int __init alsa_rawmidi_init(void) amidi_map[i] = 1; } } - } #endif /* CONFIG_SND_OSSEMUL */ return 0; } |