aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usx2y
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usx2y')
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c4
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index affda973cece..c5989cb7db3f 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -941,10 +941,8 @@ static void usX2Y_audio_stream_free(snd_usX2Y_substream_t **usX2Y_substream)
941static void snd_usX2Y_pcm_private_free(snd_pcm_t *pcm) 941static void snd_usX2Y_pcm_private_free(snd_pcm_t *pcm)
942{ 942{
943 snd_usX2Y_substream_t **usX2Y_stream = pcm->private_data; 943 snd_usX2Y_substream_t **usX2Y_stream = pcm->private_data;
944 if (usX2Y_stream) { 944 if (usX2Y_stream)
945 snd_pcm_lib_preallocate_free_for_all(pcm);
946 usX2Y_audio_stream_free(usX2Y_stream); 945 usX2Y_audio_stream_free(usX2Y_stream);
947 }
948} 946}
949 947
950static int usX2Y_audio_stream_new(snd_card_t *card, int playback_endpoint, int capture_endpoint) 948static int usX2Y_audio_stream_new(snd_card_t *card, int playback_endpoint, int capture_endpoint)
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index c9136a98755f..4bbf52bd6025 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -740,12 +740,6 @@ static void snd_usX2Y_hwdep_pcm_private_free(snd_hwdep_t *hwdep)
740} 740}
741 741
742 742
743static void snd_usX2Y_usbpcm_private_free(snd_pcm_t *pcm)
744{
745 snd_pcm_lib_preallocate_free_for_all(pcm);
746}
747
748
749int usX2Y_hwdep_pcm_new(snd_card_t* card) 743int usX2Y_hwdep_pcm_new(snd_card_t* card)
750{ 744{
751 int err; 745 int err;
@@ -776,7 +770,6 @@ int usX2Y_hwdep_pcm_new(snd_card_t* card)
776 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usX2Y_usbpcm_ops); 770 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usX2Y_usbpcm_ops);
777 771
778 pcm->private_data = usX2Y(card)->subs; 772 pcm->private_data = usX2Y(card)->subs;
779 pcm->private_free = snd_usX2Y_usbpcm_private_free;
780 pcm->info_flags = 0; 773 pcm->info_flags = 0;
781 774
782 sprintf(pcm->name, NAME_ALLCAPS" hwdep Audio"); 775 sprintf(pcm->name, NAME_ALLCAPS" hwdep Audio");
@@ -788,7 +781,6 @@ int usX2Y_hwdep_pcm_new(snd_card_t* card)
788 SNDRV_DMA_TYPE_CONTINUOUS, 781 SNDRV_DMA_TYPE_CONTINUOUS,
789 snd_dma_continuous_data(GFP_KERNEL), 782 snd_dma_continuous_data(GFP_KERNEL),
790 64*1024, 128*1024))) { 783 64*1024, 128*1024))) {
791 snd_usX2Y_usbpcm_private_free(pcm);
792 return err; 784 return err;
793 } 785 }
794 786