1 files changed, 8 insertions, 4 deletions

diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c
index f6084bc524e8..41907d25ed38 100644
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
@@ -37,11 +37,15 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
 #else
         page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
 #endif
-        if (page) {
-                clear_highpage(page);
-                pgtable_page_ctor(page);
-                flush_dcache_page(page);
+        if (!page)
+                return NULL;
+
+        clear_highpage(page);
+        if (!pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
         }
+        flush_dcache_page(page);
         return page;
 }