ALSA: line6: Use managed buffer allocation (b9626bd6) · Commits · 戴 / test

sound/usb/line6/pcm.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -359,13 +359,6 @@ int snd_line6_hw_params(struct snd_pcm_substream *substream,
		if (ret < 0)
		goto error;

		ret = snd_pcm_lib_malloc_pages(substream,
		params_buffer_bytes(hw_params));
		if (ret < 0) {
		line6_buffer_release(line6pcm, pstr, LINE6_STREAM_PCM);
		goto error;
		}

		pstr->period = params_period_bytes(hw_params);
		error:
		mutex_unlock(&line6pcm->state_mutex);
		@@ -381,7 +374,7 @@ int snd_line6_hw_free(struct snd_pcm_substream *substream)
		mutex_lock(&line6pcm->state_mutex);
		line6_buffer_release(line6pcm, pstr, LINE6_STREAM_PCM);
		mutex_unlock(&line6pcm->state_mutex);
		return snd_pcm_lib_free_pages(substream);
		return 0;
		}


		@@ -501,7 +494,7 @@ static int snd_line6_new_pcm(struct usb_line6 line6, struct snd_pcm *pcm_ret)
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_line6_capture_ops);

		/* pre-allocation of buffers */
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
		NULL, 64 * 1024, 128 * 1024);
		return 0;
		}