linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/xhci-ring.c between commit 48df4a6fd8c4 ("xhci: Handle
zero-length isochronous packets") from the usb.current tree and commit
29cc88979a88 ("USB: use usb_endpoint_maxp() instead of le16_to_cpu()")
from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/usb/host/xhci-ring.c
index 54139a2,bf0b52c..0000000
--- 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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/