summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-10-11 16:43:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-21 09:28:02 -0700
commite503f73ae9607b0d4854a40a2f437cfbee529fa3 (patch)
tree12244ee8ab60790b4a2553ec0e6a0077ae99a15d /sound
parent60dd77abe18a5a3eb21c4041f6ea02b45c421cc5 (diff)
downloadlwn-e503f73ae9607b0d4854a40a2f437cfbee529fa3.tar.gz
lwn-e503f73ae9607b0d4854a40a2f437cfbee529fa3.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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ac97/ac97_codec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 9473fca9681d..8b0f99688303 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