lkml.org 
[lkml]   [2020]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 042/118] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
    Date
    From: Vinod Koul <vkoul@kernel.org>

    [ Upstream commit 282eb0b52e3f0399ee48a4cad0d9ffec840b0164 ]

    devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
    failure which should be checked with IS_ERR. Also use PTR_ERR for
    returning error codes.

    Reported-by: Takashi Iwai <tiwai@suse.de>
    Fixes: d1ede0641b05 ("ASoC: rt715: add RT715 codec driver")
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20200826163340.3249608-5-vkoul@kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt715-sdw.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
    index d11b23d6b240a..68a36739f1b0d 100644
    --- a/sound/soc/codecs/rt715-sdw.c
    +++ b/sound/soc/codecs/rt715-sdw.c
    @@ -527,8 +527,8 @@ static int rt715_sdw_probe(struct sdw_slave *slave,

    /* Regmap Initialization */
    sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap);
    - if (!sdw_regmap)
    - return -EINVAL;
    + if (IS_ERR(sdw_regmap))
    + return PTR_ERR(sdw_regmap);

    regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev,
    &rt715_regmap);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-21 18:57    [W:4.685 / U:1.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site