Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9887341b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 768b594f 25740f37

drivers/mfd/wcd9xxx-core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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;