aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-04-30 14:44:54 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 21:15:18 -0700
commit3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e (patch)
treee2a06f2fe02ad61ff687c6af0e7b0c4d3463b15a
parentf8965467f366fd18f01feafb5db10512d7b4422c (diff)
sound: fixup for usb_buffer_alloc/free rename
This is needed before the USB merge. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 5570a2ba573..de607d4411a 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)
{
if (u->urb) {
if (u->buffer_size)
- usb_buffer_free(u->subs->dev, u->buffer_size,
+ usb_free_coherent(u->subs->dev, u->buffer_size,
u->urb->transfer_buffer,
u->urb->transfer_dma);
usb_free_urb(u->urb);
@@ -154,7 +154,7 @@ void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force)
release_urb_ctx(&subs->dataurb[i]);
for (i = 0; i < SYNC_URBS; i++)
release_urb_ctx(&subs->syncurb[i]);
- usb_buffer_free(subs->dev, SYNC_URBS * 4,
+ usb_free_coherent(subs->dev, SYNC_URBS * 4,
subs->syncbuf, subs->sync_dma);
subs->syncbuf = NULL;
subs->nurbs = 0;
@@ -308,8 +308,8 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
if (!u->urb)
goto out_of_memory;
u->urb->transfer_buffer =
- usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL,
- &u->urb->transfer_dma);
+ usb_alloc_coherent(subs->dev, u->buffer_size,
+ GFP_KERNEL, &u->urb->transfer_dma);
if (!u->urb->transfer_buffer)
goto out_of_memory;
u->urb->pipe = subs->datapipe;
@@ -321,7 +321,7 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
if (subs->syncpipe) {
/* allocate and initialize sync urbs */
- subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4,
+ subs->syncbuf = usb_alloc_coherent(subs->dev, SYNC_URBS * 4,
GFP_KERNEL, &subs->sync_dma);
if (!subs->syncbuf)
goto out_of_memory;