From 25740f37d6393f43afaeef8bbaa23bb42aa12df8 Mon Sep 17 00:00:00 2001 From: Yeleswarapu Nagaradhesh Date: Tue, 26 Jul 2016 23:26:47 +0530 Subject: [PATCH] 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 --- drivers/mfd/wcd9xxx-core.c | 2 -- 1 file changed, 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; -- 2.11.0