| Message ID | 20171113111256.24140-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bc6476d6c1edcb9b97621b5131bd169aa81f27db |
| Headers | show |
On 13 November 2017 11:13, Johan Hovold wrote: > Fix child-node lookup during probe, which ended up searching the whole > device tree depth-first starting at the parent rather than just matching > on its children. > > To make things worse, the parent codec node was also prematurely freed. > > Fixes: 4d50934abd22 ("ASoC: da7218: Add da7218 codec driver") > Cc: stable <stable@vger.kernel.org> # 4.5 > Cc: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > --- > sound/soc/codecs/da7218.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c > index b2d42ec1dcd9..56564ce90cb6 100644 > --- a/sound/soc/codecs/da7218.c > +++ b/sound/soc/codecs/da7218.c > @@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct > snd_soc_codec *codec) > } > > if (da7218->dev_id == DA7218_DEV_ID) { > - hpldet_np = of_find_node_by_name(np, "da7218_hpldet"); > + hpldet_np = of_get_child_by_name(np, "da7218_hpldet"); > if (!hpldet_np) > return pdata; > > -- > 2.15.0
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index b2d42ec1dcd9..56564ce90cb6 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) } if (da7218->dev_id == DA7218_DEV_ID) { - hpldet_np = of_find_node_by_name(np, "da7218_hpldet"); + hpldet_np = of_get_child_by_name(np, "da7218_hpldet"); if (!hpldet_np) return pdata;
Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent codec node was also prematurely freed. Fixes: 4d50934abd22 ("ASoC: da7218: Add da7218 codec driver") Cc: stable <stable@vger.kernel.org> # 4.5 Cc: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- sound/soc/codecs/da7218.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)