diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-11 16:43:40 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-30 23:27:09 +0000 |
| commit | 19bed0e32102a9bc2e73a881debe956ce1a9e124 (patch) | |
| tree | b116ca554dd26b1dd9faa7796a64bf3016217ace | |
| parent | 4be11470a33359ac885539737a79dac6ba9f3495 (diff) | |
| download | lwn-19bed0e32102a9bc2e73a881debe956ce1a9e124.tar.gz lwn-19bed0e32102a9bc2e73a881debe956ce1a9e124.zip | |
ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
commit 733a48e5ae5bf28b046fad984d458c747cbb8c21 upstream.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44721
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index fac51eef2725..1e7cfba61c49 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -1271,6 +1271,8 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne tmp.index = ac97->num; kctl = snd_ctl_new1(&tmp, ac97); } + if (!kctl) + return -ENOMEM; if (reg >= AC97_PHONE && reg <= AC97_PCM) set_tlv_db_scale(kctl, db_scale_5bit_12db_max); else |