1 files changed, 4 insertions, 1 deletions

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 67a33a5a1a93..f13e067e1467 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -227,6 +227,9 @@ static struct device_attribute bdi_dev_attrs[] = {
 static __init int bdi_class_init(void)
 {
         bdi_class = class_create(THIS_MODULE, "bdi");
+        if (IS_ERR(bdi_class))
+                return PTR_ERR(bdi_class);
+
         bdi_class->dev_attrs = bdi_dev_attrs;
         bdi_debug_init();
         return 0;
@@ -609,7 +612,7 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
          * it would never exet if it is currently stuck in the refrigerator.
          */
         list_for_each_entry(wb, &bdi->wb_list, list) {
-                wb->task->flags &= ~PF_FROZEN;
+                thaw_process(wb->task);
                 kthread_stop(wb->task);
         }
 }