Commit c75c5ab5 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: USB: adjust for changed 3.8 USB API 



The recent changes in the USB API ("implement new semantics for
URB_ISO_ASAP") made the former meaning of the URB_ISO_ASAP flag the
default, and changed this flag to mean that URBs can be delayed.
This is not the behaviour wanted by any of the audio drivers because
it leads to discontinuous playback with very small period sizes.
Therefore, our URBs need to be submitted without this flag.

Reported-by: default avatarJoe Rayhawk <jrayhawk@fairlystable.org>
Cc: <stable@vger.kernel.org> # 3.8 only
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fa92dd77

sound/usb/6fire/pcm.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -575,7 +575,6 @@ static void usb6fire_pcm_init_urb(struct pcm_urb *urb, 
	urb->instance.pipe = in ? usb_rcvisocpipe(chip->dev, ep)

	urb->instance.pipe = in ? usb_rcvisocpipe(chip->dev, ep)

			: usb_sndisocpipe(chip->dev, ep);

			: usb_sndisocpipe(chip->dev, ep);

	urb->instance.interval = 1;

	urb->instance.interval = 1;

	urb->instance.transfer_flags = URB_ISO_ASAP;

	urb->instance.complete = handler;

	urb->instance.complete = handler;

	urb->instance.context = urb;

	urb->instance.context = urb;

	urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB;

	urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB;

sound/usb/caiaq/audio.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -683,7 +683,6 @@ static void read_completed(struct urb *urb) 




	if (send_it) {

	if (send_it) {

		out->number_of_packets = outframe;

		out->number_of_packets = outframe;

		out->transfer_flags = URB_ISO_ASAP;

		usb_submit_urb(out, GFP_ATOMIC);

		usb_submit_urb(out, GFP_ATOMIC);

	} else {

	} else {

		struct snd_usb_caiaq_cb_info *oinfo = out->context;

		struct snd_usb_caiaq_cb_info *oinfo = out->context;
@@ -699,7 +698,6 @@ requeue: 
	}

	}





	urb->number_of_packets = FRAMES_PER_URB;

	urb->number_of_packets = FRAMES_PER_URB;

	urb->transfer_flags = URB_ISO_ASAP;

	usb_submit_urb(urb, GFP_ATOMIC);

	usb_submit_urb(urb, GFP_ATOMIC);

}

}
@@ -765,7 +763,6 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *cdev, int dir, int *ret) 
						* BYTES_PER_FRAME;

						* BYTES_PER_FRAME;

		urbs[i]->context = &cdev->data_cb_info[i];

		urbs[i]->context = &cdev->data_cb_info[i];

		urbs[i]->interval = 1;

		urbs[i]->interval = 1;

		urbs[i]->transfer_flags = URB_ISO_ASAP;

		urbs[i]->number_of_packets = FRAMES_PER_URB;

		urbs[i]->number_of_packets = FRAMES_PER_URB;

		urbs[i]->complete = (dir == SNDRV_PCM_STREAM_CAPTURE) ?

		urbs[i]->complete = (dir == SNDRV_PCM_STREAM_CAPTURE) ?

					read_completed : write_completed;

					read_completed : write_completed;

sound/usb/endpoint.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -684,7 +684,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, 
		if (!u->urb->transfer_buffer)

		if (!u->urb->transfer_buffer)

			goto out_of_memory;

			goto out_of_memory;

		u->urb->pipe = ep->pipe;

		u->urb->pipe = ep->pipe;

		u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;

		u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;

		u->urb->interval = 1 << ep->datainterval;

		u->urb->interval = 1 << ep->datainterval;

		u->urb->context = u;

		u->urb->context = u;

		u->urb->complete = snd_complete_urb;

		u->urb->complete = snd_complete_urb;
@@ -723,8 +723,7 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep, 
		u->urb->transfer_dma = ep->sync_dma + i * 4;

		u->urb->transfer_dma = ep->sync_dma + i * 4;

		u->urb->transfer_buffer_length = 4;

		u->urb->transfer_buffer_length = 4;

		u->urb->pipe = ep->pipe;

		u->urb->pipe = ep->pipe;

		u->urb->transfer_flags = URB_ISO_ASAP |

		u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;

					 URB_NO_TRANSFER_DMA_MAP;

		u->urb->number_of_packets = 1;

		u->urb->number_of_packets = 1;

		u->urb->interval = 1 << ep->syncinterval;

		u->urb->interval = 1 << ep->syncinterval;

		u->urb->context = u;

		u->urb->context = u;

sound/usb/misc/ua101.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1120,8 +1120,7 @@ static int alloc_stream_urbs(struct ua101 *ua, struct ua101_stream *stream, 
			usb_init_urb(&urb->urb);

			usb_init_urb(&urb->urb);

			urb->urb.dev = ua->dev;

			urb->urb.dev = ua->dev;

			urb->urb.pipe = stream->usb_pipe;

			urb->urb.pipe = stream->usb_pipe;

			urb->urb.transfer_flags = URB_ISO_ASAP |

			urb->urb.transfer_flags = URB_NO_TRANSFER_DMA_MAP;

					URB_NO_TRANSFER_DMA_MAP;

			urb->urb.transfer_buffer = addr;

			urb->urb.transfer_buffer = addr;

			urb->urb.transfer_dma = dma;

			urb->urb.transfer_dma = dma;

			urb->urb.transfer_buffer_length = max_packet_size;

			urb->urb.transfer_buffer_length = max_packet_size;

sound/usb/usx2y/usb_stream.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,6 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, 
	     ++u, transfer += transfer_length) {

	     ++u, transfer += transfer_length) {

		struct urb *urb = urbs[u];

		struct urb *urb = urbs[u];

		struct usb_iso_packet_descriptor *desc;

		struct usb_iso_packet_descriptor *desc;

		urb->transfer_flags = URB_ISO_ASAP;

		urb->transfer_buffer = transfer;

		urb->transfer_buffer = transfer;

		urb->dev = dev;

		urb->dev = dev;

		urb->pipe = pipe;

		urb->pipe = pipe;

CRA Git | Maintained and supported by SUSTech CRA and CCSE