lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 370/717] ASoC: max98390: Fix error codes in max98390_dsm_init()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 3cea33b6f2d7782d1be17c71509986f33ee93541 ]

    These error paths return success but they should return -EINVAL.

    Fixes: 97ed3e509ee6 ("ASoC: max98390: Fix potential crash during param fw loading")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/X9B0uz4svyNTqeMb@mwanda
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/max98390.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
    index ff5cc9bbec291..bb736c44e68a3 100644
    --- a/sound/soc/codecs/max98390.c
    +++ b/sound/soc/codecs/max98390.c
    @@ -784,6 +784,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
    if (fw->size < MAX98390_DSM_PARAM_MIN_SIZE) {
    dev_err(component->dev,
    "param fw is invalid.\n");
    + ret = -EINVAL;
    goto err_alloc;
    }
    dsm_param = (char *)fw->data;
    @@ -794,6 +795,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
    fw->size < param_size + MAX98390_DSM_PAYLOAD_OFFSET) {
    dev_err(component->dev,
    "param fw is invalid.\n");
    + ret = -EINVAL;
    goto err_alloc;
    }
    regmap_write(max98390->regmap, MAX98390_R203A_AMP_EN, 0x80);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:39    [W:4.634 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site