MLK-10055-1: ASoC: imx-cs42888: when codec probe failed, alsa return RETRY error.
authorShengjiu Wang <shengjiu.wang@freescale.com>
Wed, 24 Dec 2014 08:08:45 +0000 (16:08 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:14 +0000 (14:48 -0500)
If there is no codec device, the machine driver will not register the
card. then alsa will not return RETRY error. update the error handling
for machine driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit 01ffd8e5e828d20214a196e64b981c9fd94c913e)

sound/soc/fsl/imx-cs42888.c

index 68eaaaa..4153d39 100644 (file)
@@ -236,7 +236,7 @@ static int imx_cs42888_probe(struct platform_device *pdev)
                goto fail;
        }
        codec_dev = of_find_i2c_device_by_node(codec_np);
-       if (!codec_dev) {
+       if (!codec_dev || !codec_dev->dev.driver) {
                dev_err(&pdev->dev, "failed to find codec platform device\n");
                ret = -EINVAL;
                goto fail;