Merge 4.3-rc5 into char-misc next

[firefly-linux-kernel-4.4.55.git] / drivers / misc / genwqe / card_ddcb.c

diff --git a/drivers/misc/genwqe/card_ddcb.c b/drivers/misc/genwqe/card_ddcb.c
index 6d51e5f086642adba8ac41c39b1347082f875083..353ee0cc733d8b7773f70393b92c24f9c9b02e56 100644 (file)
--- a/drivers/misc/genwqe/card_ddcb.c
+++ b/drivers/misc/genwqe/card_ddcb.c
@@ -203,7 +203,7 @@ struct genwqe_ddcb_cmd *ddcb_requ_alloc(void)
 {
        struct ddcb_requ *req;
 
-       req = kzalloc(sizeof(*req), GFP_ATOMIC);
+       req = kzalloc(sizeof(*req), GFP_KERNEL);
        if (!req)
                return NULL;