diff options
Diffstat (limited to 'drivers/base/power/suspend.c')
| -rw-r--r-- | drivers/base/power/suspend.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 662209d3f42d..2a769cc6f5f9 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/vt_kern.h> | ||
| 12 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 13 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
| 14 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
| @@ -66,6 +65,7 @@ int suspend_device(struct device * dev, pm_message_t state) | |||
| 66 | return error; | 65 | return error; |
| 67 | } | 66 | } |
| 68 | 67 | ||
| 68 | |||
| 69 | /** | 69 | /** |
| 70 | * device_suspend - Save state and stop all devices in system. | 70 | * device_suspend - Save state and stop all devices in system. |
| 71 | * @state: Power state to put each device in. | 71 | * @state: Power state to put each device in. |
| @@ -85,9 +85,6 @@ int device_suspend(pm_message_t state) | |||
| 85 | { | 85 | { |
| 86 | int error = 0; | 86 | int error = 0; |
| 87 | 87 | ||
| 88 | if (!is_console_suspend_safe()) | ||
| 89 | return -EINVAL; | ||
| 90 | |||
| 91 | down(&dpm_sem); | 88 | down(&dpm_sem); |
| 92 | down(&dpm_list_sem); | 89 | down(&dpm_list_sem); |
| 93 | while (!list_empty(&dpm_active) && error == 0) { | 90 | while (!list_empty(&dpm_active) && error == 0) { |
