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

Commit 90633cf3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: abort system suspends when disabling low power modes"

parents 63a245f5 e7d5281f

drivers/bus/mhi/core/mhi_init.c

+4 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,10 @@ int of_register_mhi_controller(struct mhi_controller *mhi_cntrl) 
	mhi_dev->mhi_cntrl = mhi_cntrl;

	dev_set_name(&mhi_dev->dev, "%04x_%02u.%02u.%02u", mhi_dev->dev_id,

		     mhi_dev->domain, mhi_dev->bus, mhi_dev->slot);



	/* init wake source */

	device_init_wakeup(&mhi_dev->dev, true);



	ret = device_add(&mhi_dev->dev);

	if (ret)

		goto error_add_dev;

drivers/bus/mhi/core/mhi_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -1325,6 +1325,7 @@ int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl) 
	read_lock_bh(&mhi_cntrl->pm_lock);

	mhi_cntrl->wake_get(mhi_cntrl, true);

	if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state)) {

		pm_wakeup_event(&mhi_cntrl->mhi_dev->dev, 0);

		mhi_cntrl->runtime_get(mhi_cntrl, mhi_cntrl->priv_data);

		mhi_cntrl->runtime_put(mhi_cntrl, mhi_cntrl->priv_data);

	}