Commit 3d62e3fd authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

sound: fixup for usb_buffer_alloc/free rename 



This is needed before the USB merge.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f8965467

sound/usb/urb.c

+5 −5
Original line number Diff line number Diff line
@@ -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;