diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-02 15:03:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-02 16:34:57 +0100 |
| commit | a14e7eb59bb7ce10766d4778d382ca52b235147f (patch) | |
| tree | 34627bbc0487b33136bc04aede82c89f6c84a3d5 | |
| parent | ef394acb45e232e940367053896708375da1ff92 (diff) | |
| download | linux-stable-a14e7eb59bb7ce10766d4778d382ca52b235147f.tar.gz linux-stable-a14e7eb59bb7ce10766d4778d382ca52b235147f.tar.bz2 linux-stable-a14e7eb59bb7ce10766d4778d382ca52b235147f.zip | |
ALSA: ps3: Remove unnecessary snd_pcm_lib_preallocate_free_for_all()
The ALSA core takes care that all preallocated memory is freed when the card
(and the PCM) itself is freed. There is no need to do this manually in the
driver.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/ppc/snd_ps3.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 58f292a87f98..368242519279 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -1044,7 +1044,7 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) if (!the_card.null_buffer_start_vaddr) { pr_info("%s: nullbuffer alloc failed\n", __func__); ret = -ENOMEM; - goto clean_preallocate; + goto clean_card; } pr_debug("%s: null vaddr=%p dma=%#llx\n", __func__, the_card.null_buffer_start_vaddr, @@ -1066,8 +1066,6 @@ clean_dma_map: PAGE_SIZE, the_card.null_buffer_start_vaddr, the_card.null_buffer_start_dma_addr); -clean_preallocate: - snd_pcm_lib_preallocate_free_for_all(the_card.pcm); clean_card: snd_card_free(the_card.card); clean_irq: |