aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/qcom
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2015-06-09 09:35:22 -0400
committerMark Brown <broonie@kernel.org>2015-06-09 12:18:58 -0400
commit2682c7c72e947bab2aa7f61d83eb6fb87a64d742 (patch)
tree14d8410c3b729bcc2226badd7e49f8a9249ca239 /sound/soc/qcom
parent21e904bcf9b2e57e0599e9dddff558ffd0ce5f59 (diff)
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>
Diffstat (limited to 'sound/soc/qcom')
-rw-r--r--sound/soc/qcom/storm.c9
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)
122 } 122 }
123 123
124 ret = devm_snd_soc_register_card(&pdev->dev, card); 124 ret = devm_snd_soc_register_card(&pdev->dev, card);
125 if (ret == -EPROBE_DEFER) { 125 if (ret)
126 return ret;
127 } else if (ret) {
128 dev_err(&pdev->dev, "%s() error registering soundcard: %d\n", 126 dev_err(&pdev->dev, "%s() error registering soundcard: %d\n",
129 __func__, ret); 127 __func__, ret);
130 return ret;
131 }
132 128
133 return 0; 129 return ret;
130
134} 131}
135 132
136#ifdef CONFIG_OF 133#ifdef CONFIG_OF