Commit d563b6c8 authored by Mark Brown's avatar Mark Brown

Merge series "ASoC: Fix return check for devm_regmap_init_sdw()" from Vinod...

Merge series "ASoC: Fix return check for devm_regmap_init_sdw()" from Vinod Koul <vkoul@kernel.org>:

This series attempts to fix return check for devm_regmap_init_sdw()

Changes in v2:
 - Add missing patch for rt711
 - Add patch for rt700

Vinod Koul (5):
  ASoC: max98373: Fix return check for devm_regmap_init_sdw()
  ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
  ASoC: rt711: Fix return check for devm_regmap_init_sdw()
  ASoC: rt715: Fix return check for devm_regmap_init_sdw()
  ASoC: rt700: Fix return check for devm_regmap_init_sdw()

 sound/soc/codecs/max98373-sdw.c | 4 ++--
 sound/soc/codecs/rt1308-sdw.c   | 4 ++--
 sound/soc/codecs/rt700-sdw.c    | 4 ++--
 sound/soc/codecs/rt711-sdw.c    | 4 ++--
 sound/soc/codecs/rt715-sdw.c    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

--
2.26.2
parents c1e6414c db1a4250
...@@ -838,8 +838,8 @@ static int max98373_sdw_probe(struct sdw_slave *slave, ...@@ -838,8 +838,8 @@ static int max98373_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */ /* Regmap Initialization */
regmap = devm_regmap_init_sdw(slave, &max98373_sdw_regmap); regmap = devm_regmap_init_sdw(slave, &max98373_sdw_regmap);
if (!regmap) if (IS_ERR(regmap))
return -EINVAL; return PTR_ERR(regmap);
return max98373_init(slave, regmap); return max98373_init(slave, regmap);
} }
......
...@@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave, ...@@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */ /* Regmap Initialization */
regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap); regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap);
if (!regmap) if (IS_ERR(regmap))
return -EINVAL; return PTR_ERR(regmap);
rt1308_sdw_init(&slave->dev, regmap, slave); rt1308_sdw_init(&slave->dev, regmap, slave);
......
...@@ -452,8 +452,8 @@ static int rt700_sdw_probe(struct sdw_slave *slave, ...@@ -452,8 +452,8 @@ static int rt700_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */ /* Regmap Initialization */
sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap); sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap);
if (!sdw_regmap) if (IS_ERR(sdw_regmap))
return -EINVAL; return PTR_ERR(sdw_regmap);
regmap = devm_regmap_init(&slave->dev, NULL, regmap = devm_regmap_init(&slave->dev, NULL,
&slave->dev, &rt700_regmap); &slave->dev, &rt700_regmap);
......
...@@ -452,8 +452,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave, ...@@ -452,8 +452,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */ /* Regmap Initialization */
sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap); sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
if (!sdw_regmap) if (IS_ERR(sdw_regmap))
return -EINVAL; return PTR_ERR(sdw_regmap);
regmap = devm_regmap_init(&slave->dev, NULL, regmap = devm_regmap_init(&slave->dev, NULL,
&slave->dev, &rt711_regmap); &slave->dev, &rt711_regmap);
......
...@@ -527,8 +527,8 @@ static int rt715_sdw_probe(struct sdw_slave *slave, ...@@ -527,8 +527,8 @@ static int rt715_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */ /* Regmap Initialization */
sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap); sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap);
if (!sdw_regmap) if (IS_ERR(sdw_regmap))
return -EINVAL; return PTR_ERR(sdw_regmap);
regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev, regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev,
&rt715_regmap); &rt715_regmap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment