diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-03-31 22:19:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-04 15:25:39 +0200 |
| commit | fb6d679fee95d272c0a94912c4e534146823ee89 (patch) | |
| tree | ae8c3d1e376bfe2e77d917effa52b10e1b54d28e /sound/soc/soc-pcm.c | |
| parent | ASoC: SOF: topology: Fix memory leak of scontrol->name (diff) | |
| download | linux-fb6d679fee95d272c0a94912c4e534146823ee89.tar.xz linux-fb6d679fee95d272c0a94912c4e534146823ee89.zip | |
ASoC: soc-pcm: use GFP_KERNEL when the code is sleepable
At the kzalloc() call in dpcm_be_connect(), there is no spin lock involved.
It's merely protected by card->pcm_mutex, instead. The spinlock is applied
at the later call with snd_soc_pcm_stream_lock_irq() only for the list
manipulations. (See it's *_irq(), not *_irqsave(); that means the context
being sleepable at that point.) So, we can use GFP_KERNEL safely there.
This patch revert commit d8a9c6e1f676 ("ASoC: soc-pcm: use GFP_ATOMIC for
dpcm structure") which is no longer needed since commit b7898396f4bb
("ASoC: soc-pcm: Fix and cleanup DPCM locking").
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/e740f1930843060e025e3c0f17ec1393cfdafb26.1648757961.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 9a954680d492..11c9853e9e80 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1214,7 +1214,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, be_substream->pcm->nonatomic = 1; } - dpcm = kzalloc(sizeof(struct snd_soc_dpcm), GFP_ATOMIC); + dpcm = kzalloc(sizeof(struct snd_soc_dpcm), GFP_KERNEL); if (!dpcm) return -ENOMEM; |