diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-09 03:42:00 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-09 03:42:00 -0400 |
commit | 4aa01c408b7022c620241b373d4c3707a2ebeab6 (patch) | |
tree | 25df2a7453ec3bf7fc82f2871756b4efd6d3d283 /sound/isa | |
parent | 5371fc0ecdf55b6811ade8a198de8ace2f4e5861 (diff) | |
parent | a1f3f1ca66bd12c339b17a0c2ef93a093f90a277 (diff) |
Merge branch 'for-linus' into for-next
Merging the HD-audio fixes back to base devel branch for further
working on it.
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/msnd/msnd_pinnacle_mixer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle_mixer.c b/sound/isa/msnd/msnd_pinnacle_mixer.c index 17e49a071af4..b408540798c1 100644 --- a/sound/isa/msnd/msnd_pinnacle_mixer.c +++ b/sound/isa/msnd/msnd_pinnacle_mixer.c | |||
@@ -306,11 +306,12 @@ int snd_msndmix_new(struct snd_card *card) | |||
306 | spin_lock_init(&chip->mixer_lock); | 306 | spin_lock_init(&chip->mixer_lock); |
307 | strcpy(card->mixername, "MSND Pinnacle Mixer"); | 307 | strcpy(card->mixername, "MSND Pinnacle Mixer"); |
308 | 308 | ||
309 | for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++) | 309 | for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++) { |
310 | err = snd_ctl_add(card, | 310 | err = snd_ctl_add(card, |
311 | snd_ctl_new1(snd_msnd_controls + idx, chip)); | 311 | snd_ctl_new1(snd_msnd_controls + idx, chip)); |
312 | if (err < 0) | 312 | if (err < 0) |
313 | return err; | 313 | return err; |
314 | } | ||
314 | 315 | ||
315 | return 0; | 316 | return 0; |
316 | } | 317 | } |