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 040/118] ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
    Date
    From: Vinod Koul <vkoul@kernel.org>

    [ Upstream commit 344850d93c098e1b17e6f89d5e436893e9762ef3 ]

    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: a87a6653a28c ("ASoC: rt1308-sdw: add rt1308 SdW amplifier 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-3-vkoul@kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt1308-sdw.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
    index b0ba0d2acbdd6..56e952a904a39 100644
    --- a/sound/soc/codecs/rt1308-sdw.c
    +++ b/sound/soc/codecs/rt1308-sdw.c
    @@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,

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

    rt1308_sdw_init(&slave->dev, regmap, slave);

    --
    2.25.1


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