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

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

Merge "slim: msm: Set Device state to sleep in case of a suspend-timeout"

parents f7a539bd f756b155

drivers/slimbus/slim-msm-ngd.c

+3 −6
Original line number Diff line number Diff line
@@ -1798,13 +1798,10 @@ static int ngd_slim_runtime_suspend(struct device *device) 
	int ret = 0;

	mutex_lock(&dev->tx_lock);

	ret = ngd_slim_power_down(dev);

	if (ret) {

		if (ret != -EBUSY)

	if (ret && ret != -EBUSY)

		SLIM_INFO(dev, "slim resource not idle:%d\n", ret);

		dev->state = MSM_CTRL_AWAKE;

	} else {

	if (!ret || ret == -ETIMEDOUT)

		dev->state = MSM_CTRL_ASLEEP;

	}

	mutex_unlock(&dev->tx_lock);

	SLIM_INFO(dev, "Slim runtime suspend: ret %d\n", ret);

	return ret;