diff --git a/[refs] b/[refs] index 3cf8820e39e1..11fd7a390244 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21 +refs/heads/master: e2722528ce688eecf574c237f7656d3934d4f23c diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index e819e5359d57..3e69266e1f4d 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -394,7 +394,9 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev, if (!io->urbs) goto nomem; - urb_flags = URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT; + urb_flags = URB_NO_INTERRUPT; + if (dma) + urb_flags |= URB_NO_TRANSFER_DMA_MAP; if (usb_pipein(pipe)) urb_flags |= URB_SHORT_NOT_OK;