Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 26a657870664..452cc79b44af 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -1139,7 +1139,7 @@ static int save_mixer_state(struct cmipci *cm)
                 struct snd_ctl_elem_value *val;
                 unsigned int i;
 
-                val = kmalloc(sizeof(*val), GFP_ATOMIC);
+                val = kmalloc(sizeof(*val), GFP_KERNEL);
                 if (!val)
                         return -ENOMEM;
                 for (i = 0; i < CM_SAVED_MIXERS; i++) {