From e60f2bab68f4e9d74d5650fdf6520cd34cc996cb Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Wed, 21 Mar 2012 16:33:43 -0700 Subject: [PATCH] --- yaml --- r: 292607 b: refs/heads/master c: dc716e96f5a467835e8121e1caaf25d66a901cb3 h: refs/heads/master i: 292605: 93c614b56d9406b96bff42fbaf91ea303fc69c9b 292603: 01db850d56c80e3ad4d1a4f5905486929b2e39ba 292599: f8efbb55053d8aa2b7a08365e416ffe25841db4b 292591: 0bf6baf4f3e165a4d30c3e2ba323c31c9c808c17 292575: d42a2e9178cb301d3755e9ac6ec78c9c3aa77116 292543: 4a7977740ed67ba55b485042291c4e1c8ac6332b 292479: 5c02d2011f45bb5d11c20e95446b65eee1b59cb1 292351: f68dd39a2dc4120ee80b5f2280f47d3ad6d69086 v: v3 --- [refs] | 2 +- trunk/drivers/idle/intel_idle.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7e0ca7172185..b59fa83e9201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1de5b41cd3b2474c2770b825266d372073e1b28b +refs/heads/master: dc716e96f5a467835e8121e1caaf25d66a901cb3 diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c index 1c15e9b33575..d0f59c3f87ef 100644 --- a/trunk/drivers/idle/intel_idle.c +++ b/trunk/drivers/idle/intel_idle.c @@ -507,8 +507,7 @@ int intel_idle_cpu_init(int cpu) int num_substates; if (cstate > max_cstate) { - printk(PREFIX "max_cstate %d reached\n", - max_cstate); + printk(PREFIX "max_cstate %d reached\n", max_cstate); break; } @@ -524,8 +523,9 @@ int intel_idle_cpu_init(int cpu) dev->states_usage[dev->state_count].driver_data = (void *)get_driver_data(cstate); - dev->state_count += 1; - } + dev->state_count += 1; + } + dev->cpu = cpu; if (cpuidle_register_device(dev)) {