diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-07-24 20:08:13 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-07-24 20:08:13 +0200 |
commit | 43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa (patch) | |
tree | 1057babea8807af3f4a3c44fd116b7bbe99eb733 /sound/core/memalloc.c | |
parent | ALSA: hda - Add headset mic pin quirk for a Dell device (diff) | |
parent | Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and '... (diff) | |
download | linux-43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa.tar.xz linux-43cbf02e7ad51007af38f39c5b2abdc7a5d7f5aa.zip |
Merge tag 'asoc-fix-v4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'sound/core/memalloc.c')
-rw-r--r-- | sound/core/memalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 082509eb805d..f05cb6a8cbe0 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -124,7 +124,7 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size) dmab->addr = 0; if (dev->of_node) - pool = of_get_named_gen_pool(dev->of_node, "iram", 0); + pool = of_gen_pool_get(dev->of_node, "iram", 0); if (!pool) return; |