Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292607
b: refs/heads/master
c: dc716e9
h: refs/heads/master
i:
  292605: 93c614b
  292603: 01db850
  292599: f8efbb5
  292591: 0bf6baf
  292575: d42a2e9
  292543: 4a79777
  292479: 5c02d20
  292351: f68dd39
v: v3
  • Loading branch information
Marcos Paulo de Souza authored and Linus Torvalds committed Mar 22, 2012
1 parent 0c69c15 commit e60f2ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1de5b41cd3b2474c2770b825266d372073e1b28b
refs/heads/master: dc716e96f5a467835e8121e1caaf25d66a901cb3
8 changes: 4 additions & 4 deletions trunk/drivers/idle/intel_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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)) {
Expand Down

0 comments on commit e60f2ba

Please sign in to comment.