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

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

Merge "devfreq: Allow bw_hwmon resume with zero resume freq"

parents 0cf43615 e46bd766

drivers/devfreq/devfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ int devfreq_resume_device(struct devfreq *devfreq) 
		return -EINVAL;



	mutex_lock(&devfreq->event_lock);

	if (!devfreq->governor) {

	if (!devfreq->governor || !devfreq->dev_suspended) {

		mutex_unlock(&devfreq->event_lock);

		return 0;

	}

drivers/devfreq/governor_bw_hwmon.c

+0 −5
Original line number Diff line number Diff line
@@ -689,11 +689,6 @@ static int gov_resume(struct devfreq *df) 
	if (!node->hw->resume_hwmon)

		return -EPERM;



	if (!node->resume_freq) {

		dev_warn(df->dev.parent, "Governor already resumed!\n");

		return -EBUSY;

	}



	mutex_lock(&df->lock);

	update_devfreq(df);

	mutex_unlock(&df->lock);