ASoC: max98373: Fix return check for devm_regmap_init_sdw()
Subsystems (3)
PATCH 1/4 ASoC: max98373: Fix return check for devm_regmap_init_sdw()
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.
--- sound/soc/codecs/max98373-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/max98373-sdw.c +2 -2
@@ -838,8 +838,8 @@ static int max98373_sdw_probe(struct sdw_slave *slave,/* Regmap Initialization */ regmap =devm_regmap_init_sdw (slave, &max98373_sdw_regmap); -if (!regmap) -return -EINVAL ; +if (IS_ERR (regmap)) +return PTR_ERR (regmap);return max98373_init (slave, regmap); }
Signature · 1 line
2.26.2
PATCH 2/4 ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
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.
--- sound/soc/codecs/rt1308-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt1308-sdw.c +2 -2
@@ -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);
Signature · 1 line
2.26.2
PATCH 2/4 ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
In reply to Vinod Kouldevm_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
Date: Wed, 26 Aug 2020 17:45:58 +0530
Subject: [PATCH 3/4] ASoC: rt711: Fix return check for devm_regmap_init_sdw()
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.
--- sound/soc/codecs/rt711-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt711-sdw.c +2 -2
@@ -452,8 +452,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave,/* Regmap Initialization */ sdw_regmap =devm_regmap_init_sdw (slave, &rt711_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, &rt711_regmap);
Signature · 1 line
2.26.2
PATCH 4/4 ASoC: rt715: Fix return check for devm_regmap_init_sdw()
In reply to Vinod Kouldevm_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.
--- sound/soc/codecs/rt715-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/rt715-sdw.c +2 -2
@@ -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);
Signature · 1 line
2.26.2
Re: [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
Quoted 3 lines · Vinod Koul
devm_regmap_init_sdw()returns a valid pointer on success orERR_PTRon failure which should be checked withIS_ERR. Also usePTR_ERRfor 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;
--
Quoted 24 lines
Reported-by Takashi Iwai <[email protected]>Fixes d1ede0641b05 ("ASoC: rt715: add RT715 codec driver")Signed-off-by Vinod Koul <[email protected]>--- sound/soc/codecs/rt715-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/codecs/rt715-sdw.c +2
-2@@ -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);
Re: [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
Quoted 7 lines · Pierre-Louis Bossart
Quoted 3 lines · Vinod Koul
devm_regmap_init_sdw()returns a valid pointer on success orERR_PTRon failure which should be checked withIS_ERR. Also usePTR_ERRfor returning error codes.
Quoted 6 lines
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;
Yes missed this one
Quoted 5 lines
--
rt711-sdw.c:sdw_regmap=devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
rt711-sdw.c- if (!sdw_regmap)
rt711-sdw.c- return-EINVAL;
And somehow patch series is messed, I have two 2/4 but no 3/4 which patches rt711-sdw.c, will send v2 with these fixed
Signature · 1 line
~Vinod