usb: wusbcore: set packet count correctly on isoc transfers

This patch correctly sets the dwNumOfPackets field of the HWA transfer
request for isochronous transfers with multiple segments.  Previously
all segments used the value that was set for the first segment which may
not be correct.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 6aeb52cdc3fbdb376a2c78b2ebc3a3f2c3245789..a70e142da3302ca75432bea0691431ee7f9ef190 100644 (file)
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -1259,8 +1259,11 @@ static int __wa_xfer_setup(struct wa_xfer *xfer, struct urb *urb)
                for (cnt = 1; cnt < xfer->segs; cnt++) {
                        struct wa_xfer_packet_info_hwaiso *packet_desc;
                        struct wa_seg *seg = xfer->seg[cnt];
+                       struct wa_xfer_hwaiso *xfer_iso;
 
                        xfer_hdr = &seg->xfer_hdr;
+                       xfer_iso = container_of(xfer_hdr,
+                                               struct wa_xfer_hwaiso, hdr);
                        packet_desc = ((void *)xfer_hdr) + xfer_hdr_size;
                        /*
                         * Copy values from the 0th header. Segment specific
@@ -1270,6 +1273,8 @@ static int __wa_xfer_setup(struct wa_xfer *xfer, struct urb *urb)
                        xfer_hdr->bTransferSegment = cnt;
                        xfer_hdr->dwTransferLength =
                                cpu_to_le32(seg->isoc_size);
+                       xfer_iso->dwNumOfPackets =
+                                       cpu_to_le32(seg->isoc_frame_count);
                        __wa_setup_isoc_packet_descr(packet_desc, xfer, seg);
                        seg->status = WA_SEG_READY;
                }