Pull request for Rafael from devfreq targetting next RC (4.3-rcX)
There are two bugfixes included. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWDebUAAoJEBOhurvWBoCKHmQQAIt/YVivAdp7NiAfNjPsJhVl YegzRA2JmG2XAqJa1nEltMzawMKHfyinV3mwrbDA3Uk1SDh5L483ucPKSROysdTz /8dWIWPPgO+Y0kt7HBAoj+Q/+pOcrNoBeb1+muYCxFOse43O4RXKqdZb7BlEPiKf eDIrsq7HtAIA6FFlcVD4HyMSS3WkxBWpZMIu/DcKsLPc1cZrhvNYDd4rXWLSEDF7 u74ztOlDNz0n9nwM1tP/M8cG08jlXAyjlz6zfGP+j8AzjRd6HUJAAgiF4eg63CfH JF3r1DQCGTjmcmk0qiT8WGl1BpxM8ez8D7qgMPIV6jkHgk4KBPsg1w/0btJhUGIW i4SIMbrXJAkq0USLiw6rQUAsKCpiYT5ZMxamQ5UUDYegcRF678xb0tkwQMFbPxVi StoyAeC7m+H9WEnZoANZtzXKWURtHa9tiFUuJVr5/V8FDFrQWfwVKs9lzUihiEyz 6P+IDeBRCv59qzjK0gMqIOq5PwllS2Mwhb+cyw7b13NN6esq3bnx+BNkIgTcbH4J Gj60Jr3KCx4ttSa8i7UWeHOxhAy/btjlLjUYo4uR0I9ylYxGPzFkyCTgmXUOr8E8 LM3RIs9bPTkcknEyuBEmgpe7oAvkKKWilS1GlWjbTb+KHxmaqQD2KCbFwXqm/Pmj EDyzaIK6cMPhM6SRD8Jp =tYMc -----END PGP SIGNATURE----- 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()
This commit is contained in:
commit
d61e87ac53
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue