Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a14e7eb5 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ef394acb

sound/ppc/snd_ps3.c

+1 −3
Original line number Diff line number Diff line
@@ -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 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) 
			  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: