]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: dapm: Remove local OOM error message
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Fri, 1 May 2015 11:37:24 +0000 (12:37 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 4 May 2015 12:51:16 +0000 (13:51 +0100)
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>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Tested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c

index 79b9478202312e4ac33fbfdc4af012e9203d6fd2..beb48b60814287dd3a0f543ad75c62b45154b66e 100644 (file)
@@ -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);