diff options
| author | Mark Brown <broonie@kernel.org> | 2020-08-26 19:26:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-26 19:26:59 +0100 |
| commit | d563b6c834ae1da46fcb1f00f262c76a155aa231 (patch) | |
| tree | c1df9f31003377c65f13bfdcabffa7b099dfa047 /sound | |
| parent | c1e6414cdc371f9ed82cefebba7538499a3059f9 (diff) | |
| parent | db1a4250aef53775ec0094b81454213319cc8c74 (diff) | |
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
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max98373-sdw.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt1308-sdw.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt700-sdw.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt711-sdw.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt715-sdw.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c index 5fe724728e84..e4675cfff7b2 100644 --- a/sound/soc/codecs/max98373-sdw.c +++ b/sound/soc/codecs/max98373-sdw.c @@ -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); } diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c index b0ba0d2acbdd..56e952a904a3 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); diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c index 4d14048d1197..1d24bf040718 100644 --- a/sound/soc/codecs/rt700-sdw.c +++ b/sound/soc/codecs/rt700-sdw.c @@ -452,8 +452,8 @@ static int rt700_sdw_probe(struct sdw_slave *slave, /* Regmap Initialization */ sdw_regmap = devm_regmap_init_sdw(slave, &rt700_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, &rt700_regmap); diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c index 45b928954b58..7efff130a638 100644 --- a/sound/soc/codecs/rt711-sdw.c +++ b/sound/soc/codecs/rt711-sdw.c @@ -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); 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); |