From 33dfd0bfea7c075938944d176f6f8d7100a0c1b5 Mon Sep 17 00:00:00 2001 From: Jonghwa Lee Date: Wed, 26 Sep 2012 09:43:31 +0900 Subject: [PATCH] --- yaml --- r: 334222 b: refs/heads/master c: a4b6fec977020a508ff04b05f0fa01221a4ecf29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/thermal/cpu_cooling.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07a6a4913163..4b4200a47eb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79e093c3fe9de9fe0743a53e4809f481d2719060 +refs/heads/master: a4b6fec977020a508ff04b05f0fa01221a4ecf29 diff --git a/trunk/drivers/thermal/cpu_cooling.c b/trunk/drivers/thermal/cpu_cooling.c index 99a5d7551b33..9050c1b0573c 100644 --- a/trunk/drivers/thermal/cpu_cooling.c +++ b/trunk/drivers/thermal/cpu_cooling.c @@ -351,7 +351,7 @@ struct thermal_cooling_device *cpufreq_cooling_register( struct cpufreq_cooling_device *cpufreq_dev = NULL; unsigned int cpufreq_dev_count = 0, min = 0, max = 0; char dev_name[THERMAL_NAME_LENGTH]; - int ret = 0, id = 0, i; + int ret = 0, i; struct cpufreq_policy policy; list_for_each_entry(cpufreq_dev, &cooling_cpufreq_list, node) @@ -396,7 +396,6 @@ struct thermal_cooling_device *cpufreq_cooling_register( kfree(cpufreq_dev); return ERR_PTR(-EINVAL); } - cpufreq_dev->id = id; cpufreq_dev->cool_dev = cool_dev; cpufreq_dev->cpufreq_state = 0; mutex_lock(&cooling_cpufreq_lock);