USB: fix a bug in the scatter-gather library

This patch (as1298) fixes a bug in the new scatter-gather URB
facility.  If an URB uses a scatterlist then it should not have the
URB_NO_INTERRUPT flag set; otherwise the system won't be notified when
the transfer completes.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: David Vrabel <david.vrabel@csr.com>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 8d874cad6581d6e3c90d2e5cf0be5a75bc6ff0f9..adb9c8ee0c1f096f67e7f3ca5faf2ba423c27abb 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -403,7 +403,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
        if (!io->urbs)
                goto nomem;
 
-       urb_flags = URB_NO_INTERRUPT;
+       urb_flags = 0;
        if (dma)
                urb_flags |= URB_NO_TRANSFER_DMA_MAP;
        if (usb_pipein(pipe))
@@ -435,6 +435,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
                io->urbs[0]->num_sgs = io->entries;
                io->entries = 1;
        } else {
+               urb_flags |= URB_NO_INTERRUPT;
                for_each_sg(sg, sg, io->entries, i) {
                        unsigned len;