OSDN Git Service

Revert "drivers: mfd: Return EPROBE_DEFER during codec failure"
authorYeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Tue, 26 Jul 2016 17:56:47 +0000 (23:26 +0530)
committerYeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
Fri, 29 Jul 2016 23:23:02 +0000 (04:53 +0530)
This reverts commit 96913bef9307 ("drivers: mfd: Return EPROBE_DEFER during
codec failure"). If target can support multiple codecs,
one of the codec enumerates. When other codec fails to enumerate,
donot return -EPROBE_DEFER otherwise probe is triggered again
which is cleaning common resources and hence enumerated
codec is going to bad state.

CRs-Fixed: 1048317
Change-Id: I2f87777684c53408b7f73596f54c46b171469b76
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
drivers/mfd/wcd9xxx-core.c

index 31ac662..981d372 100644 (file)
@@ -1339,7 +1339,6 @@ static int wcd9xxx_slim_probe(struct slim_device *slim)
        if (ret) {
                dev_err(&slim->dev, "%s: failed to get slimbus %s logical address: %d\n",
                       __func__, wcd9xxx->slim->name, ret);
-               ret = -EPROBE_DEFER;
                goto err_reset;
        }
        wcd9xxx->read_dev = wcd9xxx_slim_read_device;
@@ -1364,7 +1363,6 @@ static int wcd9xxx_slim_probe(struct slim_device *slim)
        if (ret) {
                dev_err(&slim->dev, "%s: failed to get slimbus %s logical address: %d\n",
                       __func__, wcd9xxx->slim->name, ret);
-               ret = -EPROBE_DEFER;
                goto err_slim_add;
        }
        wcd9xxx_inf_la = wcd9xxx->slim_slave->laddr;