evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "drivers: mfd: Return EPROBE_DEFER during codec failure"

Browse source 
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>
This commit is contained in:
Yeleswarapu Nagaradhesh 2016-07-26 23:26:47 +05:30
parent 7eb20e5733
commit 25740f37d6
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mfd/wcd9xxx-core.c
View file

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