From: Charles Keepax Date: Fri, 1 May 2015 11:37:24 +0000 (+0100) Subject: ASoC: dapm: Remove local OOM error message X-Git-Tag: firefly_0821_release~176^2~1082^2~116^2~6^5~7 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=40b7bea10ae09595da5d66228d93e3920306790d;p=firefly-linux-kernel-4.4.55.git ASoC: dapm: Remove local OOM error message The memory subsystem is pretty chatty on failure no need to have local OOM messages as well. Signed-off-by: Charles Keepax Reviewed-by: Lars-Peter Clausen Tested-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 79b947820231..beb48b608142 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -310,12 +310,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, struct soc_mixer_control *mc; data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) { - dev_err(widget->dapm->dev, - "ASoC: can't allocate kcontrol data for %s\n", - widget->name); + if (!data) return -ENOMEM; - } INIT_LIST_HEAD(&data->paths);