diff options
| author | Sylwester Nawrocki | 2015-01-14 19:42:29 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-01-14 20:46:53 +0100 |
| commit | 53f7faa17e9489f8b7be67dd9e87167f1779ef28 (patch) | |
| tree | 554f8caf412fcdaf9fb19f1774ec7bd3ad41cb7a /sound/soc/samsung | |
| parent | ASoC: samsung: i2s: samsung_i2s_get_driver_data() cleanup (diff) | |
| download | kernel-qcow2-linux-53f7faa17e9489f8b7be67dd9e87167f1779ef28.tar.gz kernel-qcow2-linux-53f7faa17e9489f8b7be67dd9e87167f1779ef28.tar.xz kernel-qcow2-linux-53f7faa17e9489f8b7be67dd9e87167f1779ef28.zip | |
ASoC: samsung: i2s: Add return value checks in probe()
These functions may fail so let's properly report any errors.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index e5473ee799d7..aa52b41f1749 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1173,11 +1173,13 @@ static int samsung_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Unable to get drvdata\n"); return -EFAULT; } - devm_snd_soc_register_component(&sec_dai->pdev->dev, + ret = devm_snd_soc_register_component(&sec_dai->pdev->dev, &samsung_i2s_component, &sec_dai->i2s_dai_drv, 1); - samsung_asoc_dma_platform_register(&pdev->dev); - return 0; + if (ret != 0) + return ret; + + return samsung_asoc_dma_platform_register(&pdev->dev); } pri_dai = i2s_alloc_dai(pdev, false); @@ -1290,7 +1292,9 @@ static int samsung_i2s_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); - samsung_asoc_dma_platform_register(&pdev->dev); + ret = samsung_asoc_dma_platform_register(&pdev->dev); + if (ret != 0) + return ret; return 0; err: |