diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /kernel/power/main.c | |
| parent | fd88de569b802c4a04aaa6ee74667775f4aed8c6 (diff) | |
| parent | d8c3291c73b958243b33f8509d4507e76dafd055 (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index ee371f50ccaa..a6d9ef46009e 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -272,7 +272,7 @@ static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n | |||
| 272 | if (*s && !strncmp(buf, *s, len)) | 272 | if (*s && !strncmp(buf, *s, len)) |
| 273 | break; | 273 | break; |
| 274 | } | 274 | } |
| 275 | if (*s) | 275 | if (state < PM_SUSPEND_MAX && *s) |
| 276 | error = enter_state(state); | 276 | error = enter_state(state); |
| 277 | else | 277 | else |
| 278 | error = -EINVAL; | 278 | error = -EINVAL; |