Commit 59c0b586 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: gadget: Fix EEM driver comments and VID/PID
  usb-storage: Workaround devices with bogus sense size
  USB: ehci: Fix IST boundary checking interval math.
  USB: option: Support for AIRPLUS MCD650 Datacard
  USB: whci-hcd: always do an update after processing a halted qTD
  USB: whci-hcd: handle early deletion of endpoints
  USB: wusb: don't use the stack to read security descriptor
  USB: rename Documentation/ABI/.../sysfs-class-usb_host
parents b25eaebc 4238ef54

Documentation/ABI/testing/sysfs-class-usb_host→Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

+2 −2
Original line number Diff line number Diff line 
What:           /sys/class/usb_host/usb_hostN/wusb_chid

What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_chid

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>
@@ -9,7 +9,7 @@ Description: 


                Set an all zero CHID to stop the host controller.



What:           /sys/class/usb_host/usb_hostN/wusb_trust_timeout

What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_trust_timeout

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>

drivers/usb/gadget/ether.c

+2 −7
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ 
 * simpler, Microsoft pushes their own approach: RNDIS.  The published

 * RNDIS specs are ambiguous and appear to be incomplete, and are also

 * needlessly complex.  They borrow more from CDC ACM than CDC ECM.

 *

 * While CDC ECM, CDC Subset, and RNDIS are designed to extend the ethernet

 * interface to the target, CDC EEM was designed to use ethernet over the USB

 * link between the host and target.  CDC EEM is implemented as an alternative

 * to those other protocols when that communication model is more appropriate

 */



#define DRIVER_DESC		"Ethernet Gadget"
@@ -157,8 +152,8 @@ static inline bool has_rndis(void) 
#define RNDIS_PRODUCT_NUM	0xa4a2	/* Ethernet/RNDIS Gadget */



/* For EEM gadgets */

#define EEM_VENDOR_NUM	0x0525	/* INVALID - NEEDS TO BE ALLOCATED */

#define EEM_PRODUCT_NUM	0xa4a1	/* INVALID - NEEDS TO BE ALLOCATED */

#define EEM_VENDOR_NUM		0x1d6b	/* Linux Foundation */

#define EEM_PRODUCT_NUM		0x0102	/* EEM Gadget */



/*-------------------------------------------------------------------------*/

drivers/usb/host/ehci-sched.c

+6 −6
Original line number Diff line number Diff line
@@ -1400,6 +1400,10 @@ iso_stream_schedule ( 
		goto fail;

	}



	period = urb->interval;

	if (!stream->highspeed)

		period <<= 3;



	now = ehci_readl(ehci, &ehci->regs->frame_index) % mod;



	/* when's the last uframe this urb could start? */
@@ -1417,8 +1421,8 @@ iso_stream_schedule ( 


		/* Fell behind (by up to twice the slop amount)? */

		if (start >= max - 2 * 8 * SCHEDULE_SLOP)

			start += stream->interval * DIV_ROUND_UP(

					max - start, stream->interval) - mod;

			start += period * DIV_ROUND_UP(

					max - start, period) - mod;



		/* Tried to schedule too far into the future? */

		if (unlikely((start + sched->span) >= max)) {
@@ -1441,10 +1445,6 @@ iso_stream_schedule ( 


	/* NOTE:  assumes URB_ISO_ASAP, to limit complexity/bugs */



	period = urb->interval;

	if (!stream->highspeed)

		period <<= 3;



	/* find a uframe slot with enough bandwidth */

	for (; start < (stream->next_uframe + period); start++) {

		int		enough_space;

drivers/usb/host/whci/asl.c

+16 −7
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ static uint32_t process_qset(struct whc *whc, struct whc_qset *qset) 
		if (status & QTD_STS_HALTED) {

			/* Ug, an error. */

			process_halted_qtd(whc, qset, td);

			/* A halted qTD always triggers an update

			   because the qset was either removed or

			   reactivated. */

			update |= WHC_UPDATE_UPDATED;

			goto done;

		}
@@ -305,6 +309,7 @@ int asl_urb_dequeue(struct whc *whc, struct urb *urb, int status) 
	struct whc_urb *wurb = urb->hcpriv;

	struct whc_qset *qset = wurb->qset;

	struct whc_std *std, *t;

	bool has_qtd = false;

	int ret;

	unsigned long flags;
@@ -315,17 +320,21 @@ int asl_urb_dequeue(struct whc *whc, struct urb *urb, int status) 
		goto out;



	list_for_each_entry_safe(std, t, &qset->stds, list_node) {

		if (std->urb == urb)

		if (std->urb == urb) {

			if (std->qtd)

				has_qtd = true;

			qset_free_std(whc, std);

		else

		} else

			std->qtd = NULL; /* so this std is re-added when the qset is */

	}



	if (has_qtd) {

		asl_qset_remove(whc, qset);

		wurb->status = status;

		wurb->is_async = true;

		queue_work(whc->workqueue, &wurb->dequeue_work);



	} else

		qset_remove_urb(whc, qset, urb, status);

out:

	spin_unlock_irqrestore(&whc->lock, flags);

drivers/usb/host/whci/pzl.c

+17 −7
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ static enum whc_update pzl_process_qset(struct whc *whc, struct whc_qset *qset) 
		if (status & QTD_STS_HALTED) {

			/* Ug, an error. */

			process_halted_qtd(whc, qset, td);

			/* A halted qTD always triggers an update

			   because the qset was either removed or

			   reactivated. */

			update |= WHC_UPDATE_UPDATED;

			goto done;

		}
@@ -333,6 +337,7 @@ int pzl_urb_dequeue(struct whc *whc, struct urb *urb, int status) 
	struct whc_urb *wurb = urb->hcpriv;

	struct whc_qset *qset = wurb->qset;

	struct whc_std *std, *t;

	bool has_qtd = false;

	int ret;

	unsigned long flags;
@@ -343,17 +348,22 @@ int pzl_urb_dequeue(struct whc *whc, struct urb *urb, int status) 
		goto out;



	list_for_each_entry_safe(std, t, &qset->stds, list_node) {

		if (std->urb == urb)

		if (std->urb == urb) {

			if (std->qtd)

				has_qtd = true;

			qset_free_std(whc, std);

		else

		} else

			std->qtd = NULL; /* so this std is re-added when the qset is */

	}



	if (has_qtd) {

		pzl_qset_remove(whc, qset);

		update_pzl_hw_view(whc);

		wurb->status = status;

		wurb->is_async = false;

		queue_work(whc->workqueue, &wurb->dequeue_work);



	} else

		qset_remove_urb(whc, qset, urb, status);

out:

	spin_unlock_irqrestore(&whc->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE