| Message ID | 1557741724-6859-3-git-send-email-viorel.suman@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: ak4458: fail on probe if codec is not present | expand |
On Mon, May 13, 2019 at 1:05 PM Viorel Suman <viorel.suman@nxp.com> wrote: > > AK4458 is probed successfully even if AK4458 is not present - this > is caused by probe function returning no error on i2c access failure. > Return an error on probe if i2c access has failed. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > Signed-off-by: Viorel Suman <viorel.suman@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > sound/soc/codecs/ak4458.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c > index baf990a..7156215 100644 > --- a/sound/soc/codecs/ak4458.c > +++ b/sound/soc/codecs/ak4458.c > @@ -539,9 +539,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) > } > } > > -static void ak4458_init(struct snd_soc_component *component) > +static int ak4458_init(struct snd_soc_component *component) > { > struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > + int ret; > > /* External Mute ON */ > if (ak4458->mute_gpiod) > @@ -549,21 +550,21 @@ static void ak4458_init(struct snd_soc_component *component) > > ak4458_power_on(ak4458); > > - snd_soc_component_update_bits(component, AK4458_00_CONTROL1, > + ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1, > 0x80, 0x80); /* ACKS bit = 1; 10000000 */ > + if (ret < 0) > + return ret; > > - ak4458_rstn_control(component, 1); > + return ak4458_rstn_control(component, 1); > } > > static int ak4458_probe(struct snd_soc_component *component) > { > struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > > - ak4458_init(component); > - > ak4458->fs = 48000; > > - return 0; > + return ak4458_init(component); > } > > static void ak4458_remove(struct snd_soc_component *component) > -- > 2.7.4 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index baf990a..7156215 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -539,9 +539,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) } } -static void ak4458_init(struct snd_soc_component *component) +static int ak4458_init(struct snd_soc_component *component) { struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); + int ret; /* External Mute ON */ if (ak4458->mute_gpiod) @@ -549,21 +550,21 @@ static void ak4458_init(struct snd_soc_component *component) ak4458_power_on(ak4458); - snd_soc_component_update_bits(component, AK4458_00_CONTROL1, + ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1, 0x80, 0x80); /* ACKS bit = 1; 10000000 */ + if (ret < 0) + return ret; - ak4458_rstn_control(component, 1); + return ak4458_rstn_control(component, 1); } static int ak4458_probe(struct snd_soc_component *component) { struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); - ak4458_init(component); - ak4458->fs = 48000; - return 0; + return ak4458_init(component); } static void ak4458_remove(struct snd_soc_component *component)