summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/usbtv/usbtv-audio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-11-04 14:33:58 +0100
committerTakashi Iwai <tiwai@suse.de>2019-11-11 09:13:51 +0100
commitef99d99b2fd921148dc15e706f2fb071ba3fee6c (patch)
tree62c716f0f91bab5e677aeb472d12068742b6031b /drivers/media/usb/usbtv/usbtv-audio.c
parentstaging: most: Convert to the common vmalloc memalloc (diff)
downloadlinux-ef99d99b2fd921148dc15e706f2fb071ba3fee6c.tar.xz
linux-ef99d99b2fd921148dc15e706f2fb071ba3fee6c.zip
media: solo6x10: Remove superfluous snd_dma_continuous_data()
The recent change (commit 08422d2c559d: "ALSA: memalloc: Allow NULL device for SNDRV_DMA_TYPE_CONTINOUS type") made the PCM preallocation helper accepting NULL as the device pointer for the default usage. Drop the snd_dma_continuous_data() usage that became superfluous from the callers. Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
-rw-r--r--drivers/media/usb/usbtv/usbtv-audio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
index 6f108996142d..e746c8ddfc49 100644
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -378,8 +378,7 @@ int usbtv_audio_init(struct usbtv *usbtv)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usbtv_pcm_ops);
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
- snd_dma_continuous_data(GFP_KERNEL), USBTV_AUDIO_BUFFER,
- USBTV_AUDIO_BUFFER);
+ NULL, USBTV_AUDIO_BUFFER, USBTV_AUDIO_BUFFER);
rv = snd_card_register(card);
if (rv)