Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (2a324ce7) · Commits · e / devices / android_kernel_xiaomi_markw

kernel/power/snapshot.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -1519,11 +1519,8 @@ static int
		swsusp_alloc(struct memory_bitmap orig_bm, struct memory_bitmap copy_bm,
		unsigned int nr_pages, unsigned int nr_highmem)
		{
		int error = 0;

		if (nr_highmem > 0) {
		error = get_highmem_buffer(PG_ANY);
		if (error)
		if (get_highmem_buffer(PG_ANY))
		goto err_out;
		if (nr_highmem > alloc_highmem) {
		nr_highmem -= alloc_highmem;
		@@ -1546,7 +1543,7 @@ swsusp_alloc(struct memory_bitmap orig_bm, struct memory_bitmap copy_bm,

		err_out:
		swsusp_free();
		return error;
		return -ENOMEM;
		}

		asmlinkage int swsusp_save(void)