aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/usb/urb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/urb.c b/sound/usb/urb.c
index 5570a2ba5736..de607d4411ac 100644
--- a/sound/usb/urb.c
+++ b/sound/usb/urb.c
@@ -101,7 +101,7 @@ static void release_urb_ctx(struct snd_urb_ctx *u)
101{ 101{
102 if (u->urb) { 102 if (u->urb) {
103 if (u->buffer_size) 103 if (u->buffer_size)
104 usb_buffer_free(u->subs->dev, u->buffer_size, 104 usb_free_coherent(u->subs->dev, u->buffer_size,
105 u->urb->transfer_buffer, 105 u->urb->transfer_buffer,
106 u->urb->transfer_dma); 106 u->urb->transfer_dma);
107 usb_free_urb(u->urb); 107 usb_free_urb(u->urb);
@@ -154,7 +154,7 @@ void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force)
154 release_urb_ctx(&subs->dataurb[i]); 154 release_urb_ctx(&subs->dataurb[i]);
155 for (i = 0; i < SYNC_URBS; i++) 155 for (i = 0; i < SYNC_URBS; i++)
156 release_urb_ctx(&subs->syncurb[i]); 156 release_urb_ctx(&subs->syncurb[i]);
157 usb_buffer_free(subs->dev, SYNC_URBS * 4, 157 usb_free_coherent(subs->dev, SYNC_URBS * 4,
158 subs->syncbuf, subs->sync_dma); 158 subs->syncbuf, subs->sync_dma);
159 subs->syncbuf = NULL; 159 subs->syncbuf = NULL;
160 subs->nurbs = 0; 160 subs->nurbs = 0;
@@ -308,8 +308,8 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
308 if (!u->urb) 308 if (!u->urb)
309 goto out_of_memory; 309 goto out_of_memory;
310 u->urb->transfer_buffer = 310 u->urb->transfer_buffer =
311 usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL, 311 usb_alloc_coherent(subs->dev, u->buffer_size,
312 &u->urb->transfer_dma); 312 GFP_KERNEL, &u->urb->transfer_dma);
313 if (!u->urb->transfer_buffer) 313 if (!u->urb->transfer_buffer)
314 goto out_of_memory; 314 goto out_of_memory;
315 u->urb->pipe = subs->datapipe; 315 u->urb->pipe = subs->datapipe;
@@ -321,7 +321,7 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
321 321
322 if (subs->syncpipe) { 322 if (subs->syncpipe) {
323 /* allocate and initialize sync urbs */ 323 /* allocate and initialize sync urbs */
324 subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4, 324 subs->syncbuf = usb_alloc_coherent(subs->dev, SYNC_URBS * 4,
325 GFP_KERNEL, &subs->sync_dma); 325 GFP_KERNEL, &subs->sync_dma);
326 if (!subs->syncbuf) 326 if (!subs->syncbuf)
327 goto out_of_memory; 327 goto out_of_memory;