diff options
| author | Zhouyang Jia <jiazhouyang09@gmail.com> | 2018-06-11 16:04:06 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-06-11 15:21:19 +0200 |
| commit | ef1ffbe7889e99f5b5cccb41c89e5c94f50f3218 (patch) | |
| tree | 8ebec41ad4161420c5af9d03e083ce4d230141c1 /sound | |
| parent | d4d5a1cd298e67cb68cca8dc7dd1ea3942cce3ff (diff) | |
| download | op-kernel-dev-ef1ffbe7889e99f5b5cccb41c89e5c94f50f3218.zip op-kernel-dev-ef1ffbe7889e99f5b5cccb41c89e5c94f50f3218.tar.gz | |
ALSA: fm801: add error handling for snd_ctl_add
When snd_ctl_add fails, the lack of error-handling code may
cause unexpected results.
This patch adds error-handling code after calling snd_ctl_add.
Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -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 73a67bc..e3fb9c6 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; } |
