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

Commit 18065bee authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'for-next' of... 

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq updates for v4.16 from MyungJoo Ham

* 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: Fix potential NULL pointer dereference in governor_store
  PM / devfreq: Propagate error from devfreq_add_device()
parents 30a7acd5 63f1e05f

drivers/devfreq/devfreq.c

+3 −2
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ struct devfreq *devm_devfreq_add_device(struct device *dev, 
	devfreq = devfreq_add_device(dev, profile, governor_name, data);

	if (IS_ERR(devfreq)) {

		devres_free(ptr);

		return ERR_PTR(-ENOMEM);

		return devfreq;

	}



	*ptr = devfreq;
@@ -996,7 +996,8 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
	if (df->governor == governor) {

		ret = 0;

		goto out;

	} else if (df->governor->immutable || governor->immutable) {

	} else if ((df->governor && df->governor->immutable) ||

					governor->immutable) {

		ret = -EINVAL;

		goto out;

	}