diff --git a/[refs] b/[refs] index f0f39d9b2f55..ec7636de30a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 254b54771cc4c00002f796be65d2885191dca9dc +refs/heads/master: f2d613799af915da1fd78463ba8ec5086a0d6f92 diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c index 8aef1b49150f..0dfb24948907 100644 --- a/trunk/kernel/power/swsusp.c +++ b/trunk/kernel/power/swsusp.c @@ -1437,9 +1437,9 @@ static int read_pagedir(struct pbe *pblist) } if (error) - free_page((unsigned long)pblist); - - BUG_ON(i != swsusp_info.pagedir_pages); + free_pagedir(pblist); + else + BUG_ON(i != swsusp_info.pagedir_pages); return error; }