sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'for-linus' into for-next

Browse Source 
Merging the HD-audio fixes back to base devel branch for further
working on it.
This commit is contained in:
Takashi Iwai
2015-03-09 08:42:00 +01:00
parent 5371fc0ecd a1f3f1ca66
commit 4aa01c408b
325 changed files with 3554 additions and 1953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/isa/msnd/msnd_pinnacle_mixer.c
View File

@@ -306,11 +306,12 @@ int snd_msndmix_new(struct snd_card *card)
spin_lock_init(&chip->mixer_lock);
strcpy(card->mixername, "MSND Pinnacle Mixer");
for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++)
for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++) {
err = snd_ctl_add(card,
snd_ctl_new1(snd_msnd_controls + idx, chip));
if (err < 0)
return err;
}
return 0;
}