Message ID | 1430480247-28753-2-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, May 01, 2015 at 12:37:24PM +0100, Charles Keepax wrote: > The memory subsystem is pretty chatty on failure no need to have local > OOM messages as well. Applied, thanks.
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 79b9478..beb48b6 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);
The memory subsystem is pretty chatty on failure no need to have local OOM messages as well. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)