diff options
| author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2013-06-20 23:20:49 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 16:58:47 +0200 |
| commit | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (patch) | |
| tree | 5de6f804a86f44734718b1e47e939321b2b90a45 /sound/soc/fsl/imx-sgtl5000.c | |
| parent | Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (diff) | |
| download | linux-28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4.tar.xz linux-28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4.zip | |
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: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/fsl/imx-sgtl5000.c')
| -rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 7a8bc1220b2e..3f726e4f88db 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -113,13 +113,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ssi_pdev = of_find_device_by_node(ssi_np); if (!ssi_pdev) { dev_err(&pdev->dev, "failed to find SSI platform device\n"); - ret = -EINVAL; + ret = -EPROBE_DEFER; goto fail; } 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 -EINVAL; + return -EPROBE_DEFER; } data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |