The patch titled
     drivers/cpufreq: add calls to cpufreq_cpu_put
has been removed from the -mm tree.  Its filename was
     drivers-cpufreq-add-calls-to-cpufreq_cpu_put.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: drivers/cpufreq: add calls to cpufreq_cpu_put
From: Julia Lawall <[EMAIL PROTECTED]>

A call to cpufreq_cpu_get should be matched by a call to cpufreq_cpu_put.

The problem was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
type T;
identifier E;
expression E1, E2;
int ret;
statement S;
@@

  T E;
  ... when any
(
  E = cpufreq_cpu_get(...);
  if (E == NULL) S
|
  if ((E = cpufreq_cpu_get(...)) == NULL) S
)
  ... when != E2 = E
      when strict
(
  cpufreq_cpu_put(E);
|
  E1 = E;
|
+ cpufreq_cpu_put(E);
  return;
|
+ cpufreq_cpu_put(E);
  return ret;
)
// </smpl>

Signed-off-by: Julia Lawall <[EMAIL PROTECTED]>
Cc: Dave Jones <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/cpufreq/cpufreq.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff -puN 
drivers/cpufreq/cpufreq.c~drivers-cpufreq-add-calls-to-cpufreq_cpu_put 
drivers/cpufreq/cpufreq.c
--- a/drivers/cpufreq/cpufreq.c~drivers-cpufreq-add-calls-to-cpufreq_cpu_put
+++ a/drivers/cpufreq/cpufreq.c
@@ -676,8 +676,10 @@ static ssize_t show(struct kobject * kob
        if (!policy)
                return -EINVAL;
 
-       if (lock_policy_rwsem_read(policy->cpu) < 0)
+       if (lock_policy_rwsem_read(policy->cpu) < 0) {
+               cpufreq_cpu_put(policy);
                return -EINVAL;
+       }
 
        if (fattr->show)
                ret = fattr->show(policy, buf);
@@ -700,8 +702,10 @@ static ssize_t store(struct kobject * ko
        if (!policy)
                return -EINVAL;
 
-       if (lock_policy_rwsem_write(policy->cpu) < 0)
+       if (lock_policy_rwsem_write(policy->cpu) < 0) {
+               cpufreq_cpu_put(policy);
                return -EINVAL;
+       }
 
        if (fattr->store)
                ret = fattr->store(policy, buf, count);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

git-hid.patch
git-net.patch
drivers-net-mv643xx_ethc-use-field_sizeof.patch
drivers-block-viodasdc-use-field_sizeof.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to