diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-06-09 15:35:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-09 18:18:58 +0200 |
| commit | 2682c7c72e947bab2aa7f61d83eb6fb87a64d742 (patch) | |
| tree | 14d8410c3b729bcc2226badd7e49f8a9249ca239 | |
| parent | ASoC: qcom: storm: allocate snd_soc_card struct dynamically. (diff) | |
| download | linux-2682c7c72e947bab2aa7f61d83eb6fb87a64d742.tar.xz linux-2682c7c72e947bab2aa7f61d83eb6fb87a64d742.zip | |
ASoC: qcom: storm: remove special casing EPROBE_DEFER
This patch removes special casing the EPROBE_DEFER error handling in the
driver.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/qcom/storm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c index ee0661377672..2d833bffdba0 100644 --- a/sound/soc/qcom/storm.c +++ b/sound/soc/qcom/storm.c @@ -122,15 +122,12 @@ static int storm_platform_probe(struct platform_device *pdev) } ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret == -EPROBE_DEFER) { - return ret; - } else if (ret) { + if (ret) dev_err(&pdev->dev, "%s() error registering soundcard: %d\n", __func__, ret); - return ret; - } - return 0; + return ret; + } #ifdef CONFIG_OF |