diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
| commit | 6e02d8833338866388a3732e65eed1ff72a75a60 (patch) | |
| tree | 77b3407d7bdc182d751ed5440215c3f0aca1427d /sound/pci/fm801.c | |
| parent | 2f7d3ee28cb91bcc63890dbb7f63fde4c63e2340 (diff) | |
| parent | 97f32419d57c154fcc2cda75f65ce06a5920b72d (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linux-linaro-lsk-v4.9-test
Diffstat (limited to 'sound/pci/fm801.c')
| -rw-r--r-- | sound/pci/fm801.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index a178e0d03088..8561f60b4284 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip) if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0) return err; } - for (i = 0; i < FM801_CONTROLS; i++) - snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls[i], chip)); + for (i = 0; i < FM801_CONTROLS; i++) { + err = snd_ctl_add(chip->card, + snd_ctl_new1(&snd_fm801_controls[i], chip)); + if (err < 0) + return err; + } if (chip->multichannel) { - for (i = 0; i < FM801_CONTROLS_MULTI; i++) - snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls_multi[i], chip)); + for (i = 0; i < FM801_CONTROLS_MULTI; i++) { + err = snd_ctl_add(chip->card, + snd_ctl_new1(&snd_fm801_controls_multi[i], chip)); + if (err < 0) + return err; + } } return 0; } |