aboutsummaryrefslogtreecommitdiff
path: root/sound/usb/misc/ua101.c
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-08 22:31:27 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-08 22:31:27 +0400
commit79dbf9d1a443fc015e05dbeb5ab610059c6d9bf1 (patch)
tree044b23d8cb4827763dc0728dbaa76c4cd0eb7ac2 /sound/usb/misc/ua101.c
parentde507154419bcaf3c135b94ba3bbb3f3a6464447 (diff)
parentc554f06fc801004f3fc3b162c490d8fdf4e79725 (diff)
Merge branch 'tracking-linux-3.9.y' into merge-linux-linaro-core-trackingllct-20130508.0
Diffstat (limited to 'sound/usb/misc/ua101.c')
-rw-r--r--sound/usb/misc/ua101.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 8b81cb54026f..6ad617b94732 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;