diff --git a/[refs] b/[refs] index cbe0dc067c3a..3b71b9f003c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f454cbe8cd38b6d447e74ddaf012017fea42717e +refs/heads/master: 35ad1c8803921b28541ad28bfb18dc3b6295ba98 diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index 2fcc06eb5e60..586d6f1376cf 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -389,7 +389,6 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev, if (io->entries <= 0) return io->entries; - io->count = io->entries; io->urbs = kmalloc(io->entries * sizeof *io->urbs, mem_flags); if (!io->urbs) goto nomem; @@ -458,6 +457,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev, io->urbs[--i]->transfer_flags &= ~URB_NO_INTERRUPT; /* transaction state */ + io->count = io->entries; io->status = 0; io->bytes = 0; init_completion(&io->complete);