ALSA: mixart: Use managed buffer allocation (c6312f39) · Commits · 戴 / test

sound/pci/mixart/mixart.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -624,10 +624,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
		return err;
		}

		/* allocate buffer */
		err = snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw));

		if (err > 0) {
		if (subs->runtime->buffer_changed) {
		struct mixart_bufferinfo *bufferinfo;
		int i = (chip->chip_idx * MIXART_MAX_STREAM_PER_CARD) + (stream->pcm_number * (MIXART_PLAYBACK_STREAMS+MIXART_CAPTURE_STREAMS)) + subs->number;
		if( subs->stream == SNDRV_PCM_STREAM_CAPTURE ) {
		@@ -647,13 +644,12 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
		}
		mutex_unlock(&mgr->setup_mutex);

		return err;
		return 0;
		}

		static int snd_mixart_hw_free(struct snd_pcm_substream *subs)
		{
		struct snd_mixart *chip = snd_pcm_substream_chip(subs);
		snd_pcm_lib_free_pages(subs);
		mixart_sync_nonblock_events(chip->mgr);
		return 0;
		}
		@@ -947,7 +943,7 @@ static void preallocate_buffers(struct snd_mixart chip, struct snd_pcm pcm)
		(chip->chip_idx + 1) << 24;
		}
		#endif
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
		&chip->mgr->pci->dev,
		321024, 321024);
		}