evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sound: fixup for usb_buffer_alloc/free rename

Browse source 
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>
This commit is contained in:
Stephen Rothwell 2010-04-30 14:44:54 +10:00 • committed by Linus Torvalds
parent f8965467f3
commit 3d62e3fdce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/usb/urb.c
View file

@ -101,7 +101,7 @@ static void release_urb_ctx(struct snd_urb_ctx *u)
{ {
if (u->urb) { if (u->urb) {
if (u->buffer_size) 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_buffer,
u->urb->transfer_dma); u->urb->transfer_dma);
usb_free_urb(u->urb); 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]); release_urb_ctx(&subs->dataurb[i]);
for (i = 0; i < SYNC_URBS; i++) for (i = 0; i < SYNC_URBS; i++)
release_urb_ctx(&subs->syncurb[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, subs->sync_dma);
subs->syncbuf = NULL; subs->syncbuf = NULL;
subs->nurbs = 0; subs->nurbs = 0;
@ -308,8 +308,8 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
if (!u->urb) if (!u->urb)
goto out_of_memory; goto out_of_memory;
u->urb->transfer_buffer = u->urb->transfer_buffer =
usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL, usb_alloc_coherent(subs->dev, u->buffer_size,
&u->urb->transfer_dma); GFP_KERNEL, &u->urb->transfer_dma);
if (!u->urb->transfer_buffer) if (!u->urb->transfer_buffer)
goto out_of_memory; goto out_of_memory;
u->urb->pipe = subs->datapipe; u->urb->pipe = subs->datapipe;
@ -321,7 +321,7 @@ int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,
if (subs->syncpipe) { if (subs->syncpipe) {
/* allocate and initialize sync urbs */ /* 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); GFP_KERNEL, &subs->sync_dma);
if (!subs->syncbuf) if (!subs->syncbuf)
goto out_of_memory; goto out_of_memory;