diff options
| author | Dmitry Torokhov <[email protected]> | 2020-01-10 14:56:04 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2020-01-10 14:56:04 -0800 |
| commit | 1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c (patch) | |
| tree | 2244894a9ea0c941a8f32e5f3d196b4ea0eae24b /sound/mips/hal2.c | |
| parent | 643dd7416649bea2e8c61d8fdeeefb409a0ca5eb (diff) | |
| parent | c79f46a282390e0f5b306007bf7b11a46d529538 (diff) | |
Merge tag 'v5.5-rc5' into next
Sync up with mainline to get SPI "delay" API changes.
Diffstat (limited to 'sound/mips/hal2.c')
| -rw-r--r-- | sound/mips/hal2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 6676bcbd769f..c9e060939708 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -741,8 +741,7 @@ static int hal2_pcm_create(struct snd_hal2 *hal2) snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &hal2_capture_ops); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), - 0, 1024 * 1024); + NULL, 0, 1024 * 1024); return 0; } |