diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 19:43:25 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 19:43:25 +0400 |
| commit | 506bdac95b1728dc5dad1ca744e7db4ee6145e2b (patch) | |
| tree | 7f57b7f75d67e985a9974581cecad92d22812238 /sound/usb/misc/ua101.c | |
| parent | f1e9e3175bc540979fb06d937fb6bc7348f7536f (diff) | |
| parent | 0bfd8ffeff9dda08c69381d65c72e0aa58706ef6 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-linux-linaro-lsk
Diffstat (limited to 'sound/usb/misc/ua101.c')
| -rw-r--r-- | sound/usb/misc/ua101.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index 8b81cb54026..6ad617b9473 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c @@ -1120,8 +1120,7 @@ static int alloc_stream_urbs(struct ua101 *ua, struct ua101_stream *stream, usb_init_urb(&urb->urb); urb->urb.dev = ua->dev; urb->urb.pipe = stream->usb_pipe; - urb->urb.transfer_flags = URB_ISO_ASAP | - URB_NO_TRANSFER_DMA_MAP; + urb->urb.transfer_flags = URB_NO_TRANSFER_DMA_MAP; urb->urb.transfer_buffer = addr; urb->urb.transfer_dma = dma; urb->urb.transfer_buffer_length = max_packet_size; |