提交 28e5ca73 编写于 作者: A Arnaud Patard (Rtp) 提交者: Mark Brown

ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found

If the ssi or codec drivers are not loaded (for instance, because spi or i2c
bus drivers are not loaded), returning -EINVAL will for people to unload and
then reload the module to get sound working. Returning E_PROBE_DEFER will
mitigate this.
Signed-off-by: NArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: NMark Brown <broonie@linaro.org>
上级 84bbc4aa
...@@ -113,13 +113,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ...@@ -113,13 +113,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
ssi_pdev = of_find_device_by_node(ssi_np); ssi_pdev = of_find_device_by_node(ssi_np);
if (!ssi_pdev) { if (!ssi_pdev) {
dev_err(&pdev->dev, "failed to find SSI platform device\n"); dev_err(&pdev->dev, "failed to find SSI platform device\n");
ret = -EINVAL; ret = -EPROBE_DEFER;
goto fail; goto fail;
} }
codec_dev = of_find_i2c_device_by_node(codec_np); codec_dev = of_find_i2c_device_by_node(codec_np);
if (!codec_dev) { if (!codec_dev) {
dev_err(&pdev->dev, "failed to find codec platform device\n"); dev_err(&pdev->dev, "failed to find codec platform device\n");
return -EINVAL; return -EPROBE_DEFER;
} }
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册