Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b08346 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: (23 commits)
  ehci-fsl: add PPC_MPC837x to default y
  USB: POWERPC: ehci: fix ppc build
  USB: usb-storage: don't access beyond the end of the sg buffer
  USB: quirks and unusual_devs entry for Actions flash drive
  USB: usb-storage: unusual_devs entry for Oracom MP3 player
  USB: serial: move zte MF330 from sierra to option
  USB: add new vernier product id to ldusb.c
  USB: gadget: queue usb USB_CDC_GET_ENCAPSULATED_RESPONSE message
  USB: Add another Novatel U727 ID to the device table for usbserial
  USB: storage: Nikon D80 new FW still needs Fixup
  USB: usb-storage: don't clear-halt when Get-Max-LUN stalls
  USB: option: Added vendor id for Dell 5720 broadband modem
  USB: option: Add Kyocera KPC680 ids
  USB: quirks for known quirky audio devices
  USB: fix previous sparse fix which was incorrect
  USB: fix error handling in trancevibrator
  USB: g_printer, fix empty if statement
  USB: ehci-fsl: mpc834x config symbol is PPC_MPC834x, not MPC834x
  USB: fix usb open suspend race in cdc-acm
  USB: usb: yet another Dell wireless CDMA/EVDO modem
  ...
parents 5d637c4a b5937a41

drivers/usb/class/cdc-acm.c

+5 −5
Original line number Diff line number Diff line
@@ -496,13 +496,10 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) 
	   otherwise it is scheduled, and with high data rates data can get lost. */

	tty->low_latency = 1;



	if (usb_autopm_get_interface(acm->control)) {

		mutex_unlock(&open_mutex);

		return -EIO;

	}

	if (usb_autopm_get_interface(acm->control) < 0)

		goto early_bail;



	mutex_lock(&acm->mutex);

	mutex_unlock(&open_mutex);

	if (acm->used++) {

		usb_autopm_put_interface(acm->control);

		goto done;
@@ -536,6 +533,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) 
done:

err_out:

	mutex_unlock(&acm->mutex);

	mutex_unlock(&open_mutex);

	return rv;



full_bailout:
@@ -544,6 +542,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) 
	usb_autopm_put_interface(acm->control);

	acm->used--;

	mutex_unlock(&acm->mutex);

early_bail:

	mutex_unlock(&open_mutex);

	return -EIO;

}

drivers/usb/class/usblp.c

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ static int usblp_open(struct inode *inode, struct file *file) 
	usblp->rcomplete = 0;



	if (handle_bidir(usblp) < 0) {

		usb_autopm_put_interface(intf);

		usblp->used = 0;

		file->private_data = NULL;

		retval = -EIO;

drivers/usb/core/quirks.c

+12 −0
Original line number Diff line number Diff line
@@ -28,11 +28,23 @@ 
 * devices is broken...

 */

static const struct usb_device_id usb_quirk_list[] = {

	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255},



	/* CBM - Flash disk */

	{ USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },

	/* HP 5300/5370C scanner */

	{ USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },



	/* Creative SB Audigy 2 NX */

	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Roland SC-8820 */

	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Edirol SD-20 */

	{ USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },



	/* INTEL VALUE SSD */

	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/gadget/ether.c

+1 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,7 @@ eth_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				memcpy(req->buf, buf, n);

				req->complete = rndis_response_complete;

				rndis_free_response(dev->rndis_config, buf);

				value = n;

			}

			/* else stalls ... spec says to avoid that */

		}

drivers/usb/gadget/printer.c

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ printer_unbind(struct usb_gadget *gadget) 
		printer_req_free(dev->in_ep, req);

	}



	if (dev->current_rx_req != NULL);

	if (dev->current_rx_req != NULL)

		printer_req_free(dev->out_ep, dev->current_rx_req);



	while (!list_empty(&dev->rx_reqs)) {