diff mbox

[2/2] ASoC: qcom: storm: remove special casing EPROBE_DEFER

Message ID 1433856922-15541-1-git-send-email-srinivas.kandagatla@linaro.org
State Accepted
Commit 2682c7c72e947bab2aa7f61d83eb6fb87a64d742
Headers show

Commit Message

Srinivas Kandagatla June 9, 2015, 1:35 p.m. UTC 
This patch removes special casing the EPROBE_DEFER error handling in the
driver.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 sound/soc/qcom/storm.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c
index ee06613..2d833bf 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