diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-11-05 13:03:12 +0100 |
| commit | b22b2e3d9413724c77acd64a97b0817fb767e7f9 (patch) | |
| tree | adf467da1c230e2939d99a3687a13e6849b17cd0 /sound/core | |
| parent | 8ae4c65d7ae82fead83202448453e47078ddfde7 (diff) | |
| parent | dabc44c28f118910dea96244d903f0c270225669 (diff) | |
Merge branch 'for-linus' into for-next
Pull 6.12-devel branch for cleanup of USB-audio driver code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/ump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/ump.c b/sound/core/ump.c index cf22a17e38dd..7d59a0a9b037 100644 --- a/sound/core/ump.c +++ b/sound/core/ump.c @@ -1233,7 +1233,7 @@ static int fill_legacy_mapping(struct snd_ump_endpoint *ump) num = 0; for (i = 0; i < SNDRV_UMP_MAX_GROUPS; i++) - if (group_maps & (1U << i)) + if ((group_maps & (1U << i)) && ump->groups[i].valid) ump->legacy_mapping[num++] = i; return num; |