diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /kernel/power/user.c | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 98d357584cd6..526e8911460a 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
| @@ -49,6 +49,9 @@ static int snapshot_open(struct inode *inode, struct file *filp) | |||
| 49 | struct snapshot_data *data; | 49 | struct snapshot_data *data; |
| 50 | int error; | 50 | int error; |
| 51 | 51 | ||
| 52 | if (!hibernation_available()) | ||
| 53 | return -EPERM; | ||
| 54 | |||
| 52 | lock_system_sleep(); | 55 | lock_system_sleep(); |
| 53 | 56 | ||
| 54 | if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { | 57 | if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { |