summaryrefslogtreecommitdiffstats
path: root/sound/pci/cmipci.c
diff options
context:
space:
mode:
authorTakashi Iwai2018-04-09 22:09:27 +0200
committerTakashi Iwai2018-04-16 14:01:31 +0200
commit0be5168047c22ad6b2fa675f02e8090b192fbc8f (patch)
treeb7d7d5705e01b8c9cbde21fa8e6c072e18c7f5ae /sound/pci/cmipci.c
parentALSA: ad1889: Replace mdelay with usleep_range in snd_ad1889_ac97_ready (diff)
downloadkernel-qcow2-linux-0be5168047c22ad6b2fa675f02e8090b192fbc8f.tar.gz
kernel-qcow2-linux-0be5168047c22ad6b2fa675f02e8090b192fbc8f.tar.xz
kernel-qcow2-linux-0be5168047c22ad6b2fa675f02e8090b192fbc8f.zip
ALSA: cmipci: Allocate with GFP_KERNEL instead of GFP_ATOMIC
save_mixer_state() is called in a sleepable context, so it's safe to allocate with GFP_KERNEL instead of the current GFP_ATOMIC. The GFP_ATOMIC usage must have been based on an incorrect assumption in the very old code base. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r--sound/pci/cmipci.c2
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++) {