summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tas2770.c
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2020-09-18 21:05:40 +0200
committerMark Brown <broonie@kernel.org>2020-09-21 21:40:52 +0200
commitb0bcbe615756d5923eec4e95996e4041627e5741 (patch)
tree2a3888e41a6423daa96506ddfe09644f1df1784b /sound/soc/codecs/tas2770.c
parentASoC: rt700: wait for the delayed work to finish when the system suspends (diff)
downloadlinux-b0bcbe615756d5923eec4e95996e4041627e5741.tar.xz
linux-b0bcbe615756d5923eec4e95996e4041627e5741.zip
ASoC: tas2770: Fix calling reset in probe
tas2770_reset is called during i2c probe. The reset calls the snd_soc_component_write which depends on the tas2770->component being available. The component pointer is not set until codec_probe so move the reset to the codec_probe after the pointer is set. Fixes: 1a476abc723e6 ("tas2770: add tas2770 smart PA kernel driver") Signed-off-by: Dan Murphy <dmurphy@ti.com> Link: https://lore.kernel.org/r/20200918190548.12598-1-dmurphy@ti.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tas2770.c')
-rw-r--r--sound/soc/codecs/tas2770.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index c09851834395..03d7ad1885b8 100644
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -575,6 +575,8 @@ static int tas2770_codec_probe(struct snd_soc_component *component)
tas2770->component = component;
+ tas2770_reset(tas2770);
+
return 0;
}
@@ -771,8 +773,6 @@ static int tas2770_i2c_probe(struct i2c_client *client,
tas2770->channel_size = 0;
tas2770->slot_width = 0;
- tas2770_reset(tas2770);
-
result = tas2770_register_codec(tas2770);
if (result)
dev_err(tas2770->dev, "Register codec failed.\n");