Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / platform / goldfish / goldfish_pipe.c

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 2de1e603bd2b1d60afdf4261ce6b8c265c630d01..5f3672153b123b90bdfa4e93fd1fd8f7ec215546 100644 (file)
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -704,7 +704,7 @@ static int get_free_pipe_id_locked(struct goldfish_pipe_dev *dev)
                /* Reallocate the array */
                u32 new_capacity = 2 * dev->pipes_capacity;
                struct goldfish_pipe **pipes =
-                       kcalloc(new_capacity, sizeof(*pipes), GFP_KERNEL);
+                       kcalloc(new_capacity, sizeof(*pipes), GFP_ATOMIC);
                if (!pipes)
                        return -ENOMEM;
                memcpy(pipes, dev->pipes, sizeof(*pipes) * dev->pipes_capacity);