git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
devfreq
/
devfreq.c
diff --git
a/drivers/devfreq/devfreq.c
b/drivers/devfreq/devfreq.c
index
5d15b81
..
59d24e9
100644
(file)
--- a/
drivers/devfreq/devfreq.c
+++ b/
drivers/devfreq/devfreq.c
@@
-15,7
+15,9
@@
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/init.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/slab.h>
+#include <linux/stat.h>
#include <linux/opp.h>
#include <linux/devfreq.h>
#include <linux/workqueue.h>
#include <linux/opp.h>
#include <linux/devfreq.h>
#include <linux/workqueue.h>
@@
-416,10
+418,14
@@
out:
*/
int devfreq_remove_device(struct devfreq *devfreq)
{
*/
int devfreq_remove_device(struct devfreq *devfreq)
{
+ bool central_polling;
+
if (!devfreq)
return -EINVAL;
if (!devfreq)
return -EINVAL;
- if (!devfreq->governor->no_central_polling) {
+ central_polling = !devfreq->governor->no_central_polling;
+
+ if (central_polling) {
mutex_lock(&devfreq_list_lock);
while (wait_remove_device == devfreq) {
mutex_unlock(&devfreq_list_lock);
mutex_lock(&devfreq_list_lock);
while (wait_remove_device == devfreq) {
mutex_unlock(&devfreq_list_lock);
@@
-431,7
+437,7
@@
int devfreq_remove_device(struct devfreq *devfreq)
mutex_lock(&devfreq->lock);
_remove_devfreq(devfreq, false); /* it unlocks devfreq->lock */
mutex_lock(&devfreq->lock);
_remove_devfreq(devfreq, false); /* it unlocks devfreq->lock */
- if (
!devfreq->governor->no_
central_polling)
+ if (central_polling)
mutex_unlock(&devfreq_list_lock);
return 0;
mutex_unlock(&devfreq_list_lock);
return 0;