diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 08:18:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 08:18:10 +0200 |
| commit | 069a0f32c9ca75ec7f02146711ec1f5840a68cbf (patch) | |
| tree | 0ee4fe0bdd706333192b26a0c43dda1481862bae /drivers/platform/goldfish | |
| parent | mux: adg792a: always require I2C support (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-dev-069a0f32c9ca75ec7f02146711ec1f5840a68cbf.tar.xz linux-dev-069a0f32c9ca75ec7f02146711ec1f5840a68cbf.zip | |
Merge 4.12-rc5 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
| -rw-r--r-- | drivers/platform/goldfish/goldfish_pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index 8a4b088c52a7..0578d34eec3f 100644 --- 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); |