aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r--sound/usb/usbaudio.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 11b0826b8fe6..9d2274ce01d5 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -985,9 +985,9 @@ static void release_urb_ctx(struct snd_urb_ctx *u)
985{ 985{
986 if (u->urb) { 986 if (u->urb) {
987 if (u->buffer_size) 987 if (u->buffer_size)
988 usb_buffer_free(u->subs->dev, u->buffer_size, 988 usb_free_coherent(u->subs->dev, u->buffer_size,
989 u->urb->transfer_buffer, 989 u->urb->transfer_buffer,
990 u->urb->transfer_dma); 990 u->urb->transfer_dma);
991 usb_free_urb(u->urb); 991 usb_free_urb(u->urb);
992 u->urb = NULL; 992 u->urb = NULL;
993 } 993 }
@@ -1008,8 +1008,8 @@ static void release_substream_urbs(struct snd_usb_substream *subs, int force)
1008 release_urb_ctx(&subs->dataurb[i]); 1008 release_urb_ctx(&subs->dataurb[i]);
1009 for (i = 0; i < SYNC_URBS; i++) 1009 for (i = 0; i < SYNC_URBS; i++)
1010 release_urb_ctx(&subs->syncurb[i]); 1010 release_urb_ctx(&subs->syncurb[i]);
1011 usb_buffer_free(subs->dev, SYNC_URBS * 4, 1011 usb_free_coherent(subs->dev, SYNC_URBS * 4,
1012 subs->syncbuf, subs->sync_dma); 1012 subs->syncbuf, subs->sync_dma);
1013 subs->syncbuf = NULL; 1013 subs->syncbuf = NULL;
1014 subs->nurbs = 0; 1014 subs->nurbs = 0;
1015} 1015}
@@ -1113,8 +1113,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
1113 if (!u->urb) 1113 if (!u->urb)
1114 goto out_of_memory; 1114 goto out_of_memory;
1115 u->urb->transfer_buffer = 1115 u->urb->transfer_buffer =
1116 usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL, 1116 usb_alloc_coherent(subs->dev, u->buffer_size, GFP_KERNEL,
1117 &u->urb->transfer_dma); 1117 &u->urb->transfer_dma);
1118 if (!u->urb->transfer_buffer) 1118 if (!u->urb->transfer_buffer)
1119 goto out_of_memory; 1119 goto out_of_memory;
1120 u->urb->pipe = subs->datapipe; 1120 u->urb->pipe = subs->datapipe;
@@ -1126,8 +1126,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
1126 1126
1127 if (subs->syncpipe) { 1127 if (subs->syncpipe) {
1128 /* allocate and initialize sync urbs */ 1128 /* allocate and initialize sync urbs */
1129 subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4, 1129 subs->syncbuf = usb_alloc_coherent(subs->dev, SYNC_URBS * 4,
1130 GFP_KERNEL, &subs->sync_dma); 1130 GFP_KERNEL, &subs->sync_dma);
1131 if (!subs->syncbuf) 1131 if (!subs->syncbuf)
1132 goto out_of_memory; 1132 goto out_of_memory;
1133 for (i = 0; i < SYNC_URBS; i++) { 1133 for (i = 0; i < SYNC_URBS; i++) {