]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: rt711-sdca: fix kernel NULL pointer dereference when IO error
authorShuming Fan <shumingf@realtek.com>
Tue, 21 Jun 2022 09:07:19 +0000 (17:07 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jun 2022 15:21:57 +0000 (16:21 +0100)
The initial settings will be written before the codec probe function.
But, the rt711->component doesn't be assigned yet.
If IO error happened during initial settings operations, it will cause the kernel panic.
This patch changed component->dev to slave->dev to fix this issue.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Link: https://lore.kernel.org/r/20220621090719.30558-1-shumingf@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt711-sdca.c

index dfe3c9299ebde4aedcf0d1841d8bc1acad08efc4..5ad53bbc852843feaec6b8026c19fe1641b62eaa 100644 (file)
@@ -34,7 +34,7 @@ static int rt711_sdca_index_write(struct rt711_sdca_priv *rt711,
 
        ret = regmap_write(regmap, addr, value);
        if (ret < 0)
-               dev_err(rt711->component->dev,
+               dev_err(&rt711->slave->dev,
                        "Failed to set private value: %06x <= %04x ret=%d\n",
                        addr, value, ret);
 
@@ -50,7 +50,7 @@ static int rt711_sdca_index_read(struct rt711_sdca_priv *rt711,
 
        ret = regmap_read(regmap, addr, value);
        if (ret < 0)
-               dev_err(rt711->component->dev,
+               dev_err(&rt711->slave->dev,
                        "Failed to get private value: %06x => %04x ret=%d\n",
                        addr, *value, ret);