diff options
| author | Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org> | 2016-07-26 23:26:47 +0530 |
|---|---|---|
| committer | Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org> | 2016-07-30 04:53:02 +0530 |
| commit | 25740f37d6393f43afaeef8bbaa23bb42aa12df8 (patch) | |
| tree | 707f605b2db825da325442de07551235f6d2350c | |
| parent | 7eb20e5733b82473d2d1e9e59aa42989e73f3c70 (diff) | |
Revert "drivers: mfd: Return EPROBE_DEFER during codec failure"
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>
| -rw-r--r-- | drivers/mfd/wcd9xxx-core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mfd/wcd9xxx-core.c b/drivers/mfd/wcd9xxx-core.c index 31ac6624b8b4..981d372277ee 100644 --- a/drivers/mfd/wcd9xxx-core.c +++ b/drivers/mfd/wcd9xxx-core.c @@ -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; |