From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 11 Oct 2012 14:43:40 +0000 (+0200)
Subject: ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
X-Git-Tag: v3.7-rc2~30^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=733a48e5ae5bf28b046fad984d458c747cbb8c21;hp=ddffeb8c4d0331609ef2581d84de4d763607bd37

ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44721

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

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