From: Greg Kroah-Hartman Date: Mon, 29 Aug 2011 15:56:17 +0000 (-0700) Subject: Merge 3.1-rc4 into usb-next X-Git-Tag: MMI-PSA29.97-13-9~18248^2~179 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ed962a208cb72cff29a107d6c73247526017ddb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge 3.1-rc4 into usb-next This was done to resolve a conflict in this file: drivers/usb/host/xhci-ring.c Signed-off-by: Greg Kroah-Hartman --- 6ed962a208cb72cff29a107d6c73247526017ddb diff --cc drivers/usb/host/xhci-ring.c index 54139a2f06ce,bf0b52c6c960..58a6e26648ea --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@@ -3249,11 -3237,9 +3249,11 @@@ static int xhci_queue_isoc_tx(struct xh addr = start_addr + urb->iso_frame_desc[i].offset; td_len = urb->iso_frame_desc[i].length; td_remain_len = td_len; - /* FIXME: Ignoring zero-length packets, can those happen? */ total_packet_count = roundup(td_len, - le16_to_cpu(urb->ep->desc.wMaxPacketSize)); + usb_endpoint_maxp(&urb->ep->desc)); + /* A zero-length transfer still involves at least one packet. */ + if (total_packet_count == 0) + total_packet_count++; burst_count = xhci_get_burst_count(xhci, urb->dev, urb, total_packet_count); residue = xhci_get_last_burst_packet_count(xhci,