summaryrefslogtreecommitdiff
path: root/sound/core/control.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-10 15:42:14 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-10 15:42:14 +0100
commitec0e9937aaa8b0a4b0633711c4d70d622acd9a7f (patch)
tree7c19729d7bbd4d97784b45b2e2ec1b13dd005dd6 /sound/core/control.c
parent24db8bbaa3fcfaf0c2faccbff5864b58088ac1f6 (diff)
ALSA: core: Drop superfluous error/debug messages after malloc failures
The kernel memory allocators already report the errors when the requested allocation fails, thus we don't need to warn it again in each caller side. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/control.c')
-rw-r--r--sound/core/control.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index e1d8e0c816f0..833b223a363a 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -217,10 +217,8 @@ static int snd_ctl_new(struct snd_kcontrol **kctl, unsigned int count,
size += sizeof(struct snd_kcontrol_volatile) * count;
*kctl = kzalloc(size, GFP_KERNEL);
- if (*kctl == NULL) {
- pr_err("ALSA: Cannot allocate control instance\n");
+ if (!*kctl)
return -ENOMEM;
- }
for (idx = 0; idx < count; idx++) {
(*kctl)->vd[idx].access = access;