lkml.org 
[lkml]   [2020]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
    From
    Date


    On 8/26/20 7:28 AM, Vinod Koul wrote:
    > 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.

    Do you mind changing these two additional codecs that were missed in
    this series? Thanks!

    rt700-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap);
    rt700-sdw.c- if (!sdw_regmap)
    rt700-sdw.c- return -EINVAL;

    --
    rt711-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
    rt711-sdw.c- if (!sdw_regmap)
    rt711-sdw.c- return -EINVAL;
    --

    >
    > Reported-by: Takashi Iwai <tiwai@suse.de>
    > Fixes: d1ede0641b05 ("ASoC: rt715: add RT715 codec driver")
    > Signed-off-by: Vinod Koul <vkoul@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 d11b23d6b240..68a36739f1b0 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);
    >

    \
     
     \ /
      Last update: 2020-08-26 17:11    [W:3.861 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site