Commit dd26bf6d 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: (22 commits)
  WUSB: correct format of wusb_chid sysfs file
  WUSB: fix oops when completing URBs for disconnected devices
  WUSB: disconnect all devices when stopping a WUSB HCD
  USB: whci-hcd: check return value of usb_hcd_link_urb_to_ep()
  USB: whci-hcd: provide a endpoint_reset method
  USB: add reset endpoint operations
  USB device codes for Motorola phone.
  usb-storage: fix mistake in Makefile
  USB: usb-serial ch341: support for DTR/RTS/CTS
  Revert USB: usb-serial ch341: support for DTR/RTS/CTS
  USB: musb: fix possible panic while resuming
  USB: musb: fix isochronous TXDMA (take 2)
  USB: musb: sanitize clearing TXCSR DMA bits (take 2)
  USB: musb: bugfixes for multi-packet TXDMA support
  USB: musb_host, fix ep0 fifo flushing
  USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab
  USB: musb_host, minor enqueue locking fix (v2)
  USB: fix oops in cdc-wdm in case of malformed descriptors
  USB: qcserial: Add extra device IDs
  USB: option: Add ids for D-Link DWM-652 3.5G modem
  ...
parents 7217fa98 fca10c81

drivers/block/ub.c

+9 −11
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
{

	struct urb *urb = &sc->work_urb;

	struct bulk_cs_wrap *bcs;

	int endp;

	int len;

	int rc;
@@ -1033,6 +1034,10 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		return;

	}



	endp = usb_pipeendpoint(sc->last_pipe);

	if (usb_pipein(sc->last_pipe))

		endp |= USB_DIR_IN;



	if (cmd->state == UB_CMDST_CLEAR) {

		if (urb->status == -EPIPE) {

			/*
@@ -1048,9 +1053,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_sense(sc, cmd);
@@ -1065,9 +1068,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_stat(sc, cmd);
@@ -1082,9 +1083,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_stat_counted(sc, cmd);
@@ -2119,8 +2118,7 @@ static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe) 
	del_timer_sync(&timer);

	usb_kill_urb(&sc->work_urb);



	/* reset the endpoint toggle */

	usb_settoggle(sc->dev, endp, usb_pipeout(sc->last_pipe), 0);

	usb_reset_endpoint(sc->dev, endp);



	return 0;

}

drivers/isdn/hisax/st5481_usb.c

+1 −8
Original line number Diff line number Diff line
@@ -149,14 +149,7 @@ static void usb_ctrl_complete(struct urb *urb) 
	if (ctrl_msg->dr.bRequest == USB_REQ_CLEAR_FEATURE) {

	        /* Special case handling for pipe reset */

		le16_to_cpus(&ctrl_msg->dr.wIndex);



		/* toggle is reset on clear */

		usb_settoggle(adapter->usb_dev, 

			      ctrl_msg->dr.wIndex & ~USB_DIR_IN, 

			      (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0,

			      0);





		usb_reset_endpoint(adapter->usb_dev, ctrl_msg->dr.wIndex);

	}

	

	if (ctrl_msg->complete)

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+0 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,6 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw) 
		return ret;

	}



	usb_settoggle(hdw->usb_dev, 0 & 0xf, !(0 & USB_DIR_IN), 0);

	usb_clear_halt(hdw->usb_dev, usb_sndbulkpipe(hdw->usb_dev, 0 & 0x7f));



	pipe = usb_sndctrlpipe(hdw->usb_dev, 0);

drivers/usb/class/cdc-wdm.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ next_desc: 


	iface = &intf->altsetting[0];

	ep = &iface->endpoint[0].desc;

	if (!usb_endpoint_is_int_in(ep)) {

	if (!ep || !usb_endpoint_is_int_in(ep)) {

		rv = -EINVAL;

		goto err;

	}

drivers/usb/core/devio.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static int proc_resetep(struct dev_state *ps, void __user *arg) 
	ret = checkintf(ps, ret);

	if (ret)

		return ret;

	usb_settoggle(ps->dev, ep & 0xf, !(ep & USB_DIR_IN), 0);

	usb_reset_endpoint(ps->dev, ep);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE