diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-10-12 08:51:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-10-12 08:51:00 +0200 |
| commit | 4dda3a19141b44102860b46e307153ed8b32ea7b (patch) | |
| tree | f2326ed10e594f7a7979cb45c77e1b8a52e10090 /sound/core/pcm_memory.c | |
| parent | 148ebf548a1af366fc797fcc7d03f0bb92b12a79 (diff) | |
| parent | 96e503f9000f2ad17d550cd884a5e386eb7f532f (diff) | |
| download | linux-4dda3a19141b44102860b46e307153ed8b32ea7b.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/pcm_memory.c')
| -rw-r--r-- | sound/core/pcm_memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index 1bf6a3d9e0c2..4f03ba8ed0ae 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -377,7 +377,7 @@ struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigne */ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size) { - struct snd_card *card = substream->pcm->card; + struct snd_card *card; struct snd_pcm_runtime *runtime; struct snd_dma_buffer *dmab = NULL; @@ -387,6 +387,7 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size) SNDRV_DMA_TYPE_UNKNOWN)) return -EINVAL; runtime = substream->runtime; + card = substream->pcm->card; if (runtime->dma_buffer_p) { /* perphaps, we might free the large DMA memory region |