diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
| commit | c19ae9c2483f0253bb58d3d3c28ac20386df6066 (patch) | |
| tree | 9e3339fd0c9ac3285839626b25bb8d30bea60abd /sound/pci/ac97/ac97_codec.c | |
| parent | 836f44a71d886bc81551597612e3b1797133985f (diff) | |
| parent | b2824f4e0990716407b0c0e7acee75bb6353febf (diff) | |
Automatically merging tracking-linux-3.6.y into merge-linux-linaro-core-3.6linux-linaro-core-3.6-20121220.0
Conflicting files:
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
| -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 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 |