|
@@ -362,8 +362,27 @@ static int cx20442_component_probe(struct snd_soc_component *component)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
cx20442->por = regulator_get(component->dev, "POR");
|
|
|
- if (IS_ERR(cx20442->por))
|
|
|
- dev_warn(component->dev, "failed to get the regulator");
|
|
|
+ if (IS_ERR(cx20442->por)) {
|
|
|
+ int err = PTR_ERR(cx20442->por);
|
|
|
+
|
|
|
+ dev_warn(component->dev, "failed to get POR supply (%d)", err);
|
|
|
+ /*
|
|
|
+ * When running on a non-dt platform and requested regulator
|
|
|
+ * is not available, regulator_get() never returns
|
|
|
+ * -EPROBE_DEFER as it is not able to justify if the regulator
|
|
|
+ * may still appear later. On the other hand, the board can
|
|
|
+ * still set full constraints flag at late_initcall in order
|
|
|
+ * to instruct regulator_get() to return a dummy one if
|
|
|
+ * sufficient. Hence, if we get -ENODEV here, let's convert
|
|
|
+ * it to -EPROBE_DEFER and wait for the board to decide or
|
|
|
+ * let Deferred Probe infrastructure handle this error.
|
|
|
+ */
|
|
|
+ if (err == -ENODEV)
|
|
|
+ err = -EPROBE_DEFER;
|
|
|
+ kfree(cx20442);
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+
|
|
|
cx20442->tty = NULL;
|
|
|
|
|
|
snd_soc_component_set_drvdata(component, cx20442);
|