diff options
| -rw-r--r-- | kernel/power/snapshot.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 0dac75ea4456..64db648ff911 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -1519,11 +1519,8 @@ static int | |||
| 1519 | swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, | 1519 | swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, |
| 1520 | unsigned int nr_pages, unsigned int nr_highmem) | 1520 | unsigned int nr_pages, unsigned int nr_highmem) |
| 1521 | { | 1521 | { |
| 1522 | int error = 0; | ||
| 1523 | |||
| 1524 | if (nr_highmem > 0) { | 1522 | if (nr_highmem > 0) { |
| 1525 | error = get_highmem_buffer(PG_ANY); | 1523 | if (get_highmem_buffer(PG_ANY)) |
| 1526 | if (error) | ||
| 1527 | goto err_out; | 1524 | goto err_out; |
| 1528 | if (nr_highmem > alloc_highmem) { | 1525 | if (nr_highmem > alloc_highmem) { |
| 1529 | nr_highmem -= alloc_highmem; | 1526 | nr_highmem -= alloc_highmem; |
| @@ -1546,7 +1543,7 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm, | |||
| 1546 | 1543 | ||
| 1547 | err_out: | 1544 | err_out: |
| 1548 | swsusp_free(); | 1545 | swsusp_free(); |
| 1549 | return error; | 1546 | return -ENOMEM; |
| 1550 | } | 1547 | } |
| 1551 | 1548 | ||
| 1552 | asmlinkage int swsusp_save(void) | 1549 | asmlinkage int swsusp_save(void) |
