| Message ID | 20190117090640.12972-4-stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] ASoC: fsl_spdif: don't print EPROBE_DEFER as error | expand |
On Thu, Jan 17, 2019 at 11:07 AM Stefan Agner <stefan@agner.ch> wrote: > > Make sure to properly put the of node in case finding the codec > fails. > > Fixes: 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000") > Signed-off-by: Stefan Agner <stefan@agner.ch> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > sound/soc/fsl/imx-sgtl5000.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c > index e1e20499b2f1..45969e6dfad7 100644 > --- a/sound/soc/fsl/imx-sgtl5000.c > +++ b/sound/soc/fsl/imx-sgtl5000.c > @@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) > codec_dev = of_find_i2c_device_by_node(codec_np); > if (!codec_dev) { > dev_err(&pdev->dev, "failed to find codec platform device\n"); > - return -EPROBE_DEFER; > + ret = -EPROBE_DEFER; > + goto fail; > } > > data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > -- > 2.20.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Hi Stefan, On Thu, Jan 17, 2019 at 7:07 AM Stefan Agner <stefan@agner.ch> wrote: > > Make sure to properly put the of node in case finding the codec > fails. > > Fixes: 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000") > Signed-off-by: Stefan Agner <stefan@agner.ch> Looks good. I would suggest making this patch the first one of the series, since it is a bug fix and could potentially be applied to stable. Thanks
On Thu, Jan 17, 2019 at 10:06:39AM +0100, Stefan Agner wrote: > Make sure to properly put the of node in case finding the codec > fails. > > Fixes: 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000") > Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> > --- > sound/soc/fsl/imx-sgtl5000.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c > index e1e20499b2f1..45969e6dfad7 100644 > --- a/sound/soc/fsl/imx-sgtl5000.c > +++ b/sound/soc/fsl/imx-sgtl5000.c > @@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) > codec_dev = of_find_i2c_device_by_node(codec_np); > if (!codec_dev) { > dev_err(&pdev->dev, "failed to find codec platform device\n"); > - return -EPROBE_DEFER; > + ret = -EPROBE_DEFER; > + goto fail; > } > > data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > -- > 2.20.1 >
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index e1e20499b2f1..45969e6dfad7 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) codec_dev = of_find_i2c_device_by_node(codec_np); if (!codec_dev) { dev_err(&pdev->dev, "failed to find codec platform device\n"); - return -EPROBE_DEFER; + ret = -EPROBE_DEFER; + goto fail; } data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
Make sure to properly put the of node in case finding the codec fails. Fixes: 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000") Signed-off-by: Stefan Agner <stefan@agner.ch> --- sound/soc/fsl/imx-sgtl5000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)