]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: qcom: storm: remove special casing EPROBE_DEFER
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 9 Jun 2015 13:35:22 +0000 (14:35 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 9 Jun 2015 16:18:58 +0000 (17:18 +0100)
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>
sound/soc/qcom/storm.c

index ee0661377672db2e6f0ebf4fab69b5130056bf87..2d833bffdba0340142f4fb3bc63da9851df90ff3 100644 (file)
@@ -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