diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /kernel/power/disk.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index fb8de63c2919..c51a4d96d4eb 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -234,6 +234,16 @@ static int software_resume(void) | |||
| 234 | { | 234 | { |
| 235 | int error; | 235 | int error; |
| 236 | 236 | ||
| 237 | if (!swsusp_resume_device) { | ||
| 238 | if (!strlen(resume_file)) | ||
| 239 | return -ENOENT; | ||
| 240 | swsusp_resume_device = name_to_dev_t(resume_file); | ||
| 241 | pr_debug("swsusp: Resume From Partition %s\n", resume_file); | ||
| 242 | } else { | ||
| 243 | pr_debug("swsusp: Resume From Partition %d:%d\n", | ||
| 244 | MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device)); | ||
| 245 | } | ||
| 246 | |||
| 237 | if (noresume) { | 247 | if (noresume) { |
| 238 | /** | 248 | /** |
| 239 | * FIXME: If noresume is specified, we need to find the partition | 249 | * FIXME: If noresume is specified, we need to find the partition |