---

yaml --- r: 275623 b: refs/heads/master c: 9f3bdd4 h: refs/heads/master i: 275621: 0a532c9 275619: f052dc3 275615: c029e98 v: v3
git-mirror · Nov 14, 2011 · 888e64d · 888e64d
1 parent f180ff4
commit 888e64d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc9f54498eadc5254378e376e8d2111cfd30b229
+refs/heads/master: 9f3bdd4f937a75c4589a867dc1f8fefe09c1a618
diff --git a/trunk/drivers/devfreq/devfreq.c b/trunk/drivers/devfreq/devfreq.c
@@ -418,10 +418,14 @@ struct devfreq *devfreq_add_device(struct device *dev,
  */
 int devfreq_remove_device(struct devfreq *devfreq)
 {
+	bool central_polling;
+
 	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);
@@ -433,7 +437,7 @@ int devfreq_remove_device(struct devfreq *devfreq)
 	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;