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

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

Merge tag 'pull_req_4.3_rc4' of... 

Merge tag 'pull_req_4.3_rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq fixes for v4.3-rc5 from MyungJoo Ham.

* tag 'pull_req_4.3_rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()
parents 9ffecb10 6d3cbfa7

drivers/devfreq/devfreq.c

+4 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 
	if (err) {

		put_device(&devfreq->dev);

		mutex_unlock(&devfreq->lock);

		goto err_dev;

		goto err_out;

	}



	mutex_unlock(&devfreq->lock);
@@ -518,7 +518,6 @@ struct devfreq *devfreq_add_device(struct device *dev, 
err_init:

	list_del(&devfreq->node);

	device_unregister(&devfreq->dev);

err_dev:

	kfree(devfreq);

err_out:

	return ERR_PTR(err);
@@ -795,8 +794,10 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
		ret = PTR_ERR(governor);

		goto out;

	}

	if (df->governor == governor)

	if (df->governor == governor) {

		ret = 0;

		goto out;

	}



	if (df->governor) {

		ret = df->governor->event_handler(df, DEVFREQ_GOV_STOP, NULL);