aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-29 19:53:57 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-29 19:53:57 -0500
commitfbd22402164e687fd1be9a1372ee4f6b9373c860 (patch)
treefd86c8b2f8ed120a2229a1de7959f0d4e56c8008 /kernel/power
parentf78c4cffb86a9f1732674d810ac338cd694b1885 (diff)
parentc606850407d9096415e226c75a871d0650404446 (diff)
Merge back earlier 'pm-sleep' material.
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/console.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c
index 463aa6736751..eacb8bd8cab4 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -81,6 +81,7 @@ void pm_vt_switch_unregister(struct device *dev)
81 list_for_each_entry(tmp, &pm_vt_switch_list, head) { 81 list_for_each_entry(tmp, &pm_vt_switch_list, head) {
82 if (tmp->dev == dev) { 82 if (tmp->dev == dev) {
83 list_del(&tmp->head); 83 list_del(&tmp->head);
84 kfree(tmp);
84 break; 85 break;
85 } 86 }
86 } 87 }