From 36316acb3f1d712f331f3da6c84fb86155198f30 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 24 Dec 2014 16:08:45 +0800 Subject: MLK-10055-1: ASoC: imx-cs42888: when codec probe failed, alsa return RETRY error. 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 (cherry picked from commit 01ffd8e5e828d20214a196e64b981c9fd94c913e) --- sound/soc/fsl/imx-cs42888.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/soc/fsl/imx-cs42888.c') diff --git a/sound/soc/fsl/imx-cs42888.c b/sound/soc/fsl/imx-cs42888.c index 68eaaaa9cfcd..4153d394aa61 100644 --- a/sound/soc/fsl/imx-cs42888.c +++ b/sound/soc/fsl/imx-cs42888.c @@ -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; -- cgit v1.2.3