diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-11-23 14:42:20 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-11-27 07:59:24 -0500 |
commit | 14a07f1d8c4c64af29566316df0415052e8bdfe4 (patch) | |
tree | cb21d29bece767129941036ed762e4ba88a7dea1 | |
parent | bc6476d6c1edcb9b97621b5131bd169aa81f27db (diff) |
ASoC: da7218: Delete two error messages for a failed memory allocation in da7218_of_to_pdata()
Omit extra messages for a memory allocation failure in this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/da7218.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 56564ce90cb6..25ab7443d803 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c | |||
@@ -2455,10 +2455,8 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) | |||
2455 | u32 of_val32; | 2455 | u32 of_val32; |
2456 | 2456 | ||
2457 | pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); | 2457 | pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); |
2458 | if (!pdata) { | 2458 | if (!pdata) |
2459 | dev_warn(codec->dev, "Failed to allocate memory for pdata\n"); | ||
2460 | return NULL; | 2459 | return NULL; |
2461 | } | ||
2462 | 2460 | ||
2463 | if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0) | 2461 | if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0) |
2464 | pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32); | 2462 | pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32); |
@@ -2527,8 +2525,6 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) | |||
2527 | hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), | 2525 | hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), |
2528 | GFP_KERNEL); | 2526 | GFP_KERNEL); |
2529 | if (!hpldet_pdata) { | 2527 | if (!hpldet_pdata) { |
2530 | dev_warn(codec->dev, | ||
2531 | "Failed to allocate memory for hpldet pdata\n"); | ||
2532 | of_node_put(hpldet_np); | 2528 | of_node_put(hpldet_np); |
2533 | return pdata; | 2529 | return pdata; |
2534 | } | 2530 | } |