aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-01-02 09:03:43 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-02 10:34:57 -0500
commita14e7eb59bb7ce10766d4778d382ca52b235147f (patch)
tree34627bbc0487b33136bc04aede82c89f6c84a3d5 /sound/ppc
parentef394acb45e232e940367053896708375da1ff92 (diff)
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>
Diffstat (limited to 'sound/ppc')
-rw-r--r--sound/ppc/snd_ps3.c4
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)
1044 if (!the_card.null_buffer_start_vaddr) { 1044 if (!the_card.null_buffer_start_vaddr) {
1045 pr_info("%s: nullbuffer alloc failed\n", __func__); 1045 pr_info("%s: nullbuffer alloc failed\n", __func__);
1046 ret = -ENOMEM; 1046 ret = -ENOMEM;
1047 goto clean_preallocate; 1047 goto clean_card;
1048 } 1048 }
1049 pr_debug("%s: null vaddr=%p dma=%#llx\n", __func__, 1049 pr_debug("%s: null vaddr=%p dma=%#llx\n", __func__,
1050 the_card.null_buffer_start_vaddr, 1050 the_card.null_buffer_start_vaddr,
@@ -1066,8 +1066,6 @@ clean_dma_map:
1066 PAGE_SIZE, 1066 PAGE_SIZE,
1067 the_card.null_buffer_start_vaddr, 1067 the_card.null_buffer_start_vaddr,
1068 the_card.null_buffer_start_dma_addr); 1068 the_card.null_buffer_start_dma_addr);
1069clean_preallocate:
1070 snd_pcm_lib_preallocate_free_for_all(the_card.pcm);
1071clean_card: 1069clean_card:
1072 snd_card_free(the_card.card); 1070 snd_card_free(the_card.card);
1073clean_irq: 1071clean_irq: