lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 07/57] ASoC: topology: Check return value of soc_tplg_dai_config
    Date
    From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

    [ Upstream commit dd8e871d4e560eeb8d22af82dde91457ad835a63 ]

    Function soc_tplg_dai_config can fail, check for and handle possible
    failure.

    Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20200327204729.397-7-amadeuszx.slawinski@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/soc-topology.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
    index 22960f5932c7f..2d4a5a3058c41 100644
    --- a/sound/soc/soc-topology.c
    +++ b/sound/soc/soc-topology.c
    @@ -2431,7 +2431,7 @@ static int soc_tplg_dai_elems_load(struct soc_tplg *tplg,
    {
    struct snd_soc_tplg_dai *dai;
    int count;
    - int i;
    + int i, ret;

    count = le32_to_cpu(hdr->count);

    @@ -2446,7 +2446,12 @@ static int soc_tplg_dai_elems_load(struct soc_tplg *tplg,
    return -EINVAL;
    }

    - soc_tplg_dai_config(tplg, dai);
    + ret = soc_tplg_dai_config(tplg, dai);
    + if (ret < 0) {
    + dev_err(tplg->dev, "ASoC: failed to configure DAI\n");
    + return ret;
    + }
    +
    tplg->pos += (sizeof(*dai) + le32_to_cpu(dai->priv.size));
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-30 16:08    [W:3.072 / U:1.896 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site