diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-03 21:12:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-03 21:12:46 -0700 |
| commit | 9887341b46a92effa5853b07b4e656ec672857ae (patch) | |
| tree | f1bfb5b2da87f1526aa3b74a3eaeb98420dc4b4e | |
| parent | 768b594f2543681697c14bcdf57393ae709315c6 (diff) | |
| parent | 25740f37d6393f43afaeef8bbaa23bb42aa12df8 (diff) | |
Merge "Revert "drivers: mfd: Return EPROBE_DEFER during codec failure""
| -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; |