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

Commit b06ac5a3 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: ftdi_sio: Added custom PIDs for ChamSys products
  USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors.
  USB: cdc-acm: Add pseudo modem without AT command capabilities
  USB: cxacru: Use a bulk/int URB to access the command endpoint
  usb: serial: mos7840: Add USB IDs to support more B&B USB/RS485 converters.
  USB: cdc-acm: Adding second ACM channel support for various Nokia and one Samsung phones
  usb: serial: mos7840: Add USB ID to support the B&B Electronics USOPTL4-2P.
  USB: ssu100: turn off debug flag
  usb: allow drivers to use allocated bandwidth until unbound
  USB: cp210x usb driver: add USB_DEVICE for Pirelli DP-L10 mobile.
  USB: cp210x: Add B&G H3000 link cable ID
  USB: CP210x Add new device ID
  USB: option: fix incorrect novatel entries
  USB: Fix kernel oops with g_ether and Windows
  USB: rndis: section mismatch fix
  USB: ehci-ppc-of: problems in unwind
  USB: s3c-hsotg: Remove DEBUG define
parents 608a5ffc 65737388

drivers/usb/atm/cxacru.c

+22 −2
Original line number Diff line number Diff line
@@ -1127,6 +1127,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
{

	struct cxacru_data *instance;

	struct usb_device *usb_dev = interface_to_usbdev(intf);

	struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD];

	int ret;



	/* instance init */
@@ -1171,6 +1172,14 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
		goto fail;

	}



	if (!cmd_ep) {

		dbg("cxacru_bind: no command endpoint");

		ret = -ENODEV;

		goto fail;

	}



	if ((cmd_ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

			== USB_ENDPOINT_XFER_INT) {

		usb_fill_int_urb(instance->rcv_urb,

			usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD),

			instance->rcv_buf, PAGE_SIZE,
@@ -1180,6 +1189,17 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
			usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD),

			instance->snd_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->snd_done, 4);

	} else {

		usb_fill_bulk_urb(instance->rcv_urb,

			usb_dev, usb_rcvbulkpipe(usb_dev, CXACRU_EP_CMD),

			instance->rcv_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->rcv_done);



		usb_fill_bulk_urb(instance->snd_urb,

			usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD),

			instance->snd_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->snd_done);

	}



	mutex_init(&instance->cm_serialize);

drivers/usb/class/cdc-acm.c

+22 −1
Original line number Diff line number Diff line
@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interface *intf, 
	}



	if (!buflen) {

		if (intf->cur_altsetting->endpoint->extralen &&

		if (intf->cur_altsetting->endpoint &&

				intf->cur_altsetting->endpoint->extralen &&

				intf->cur_altsetting->endpoint->extra) {

			dev_dbg(&intf->dev,

				"Seeking extra descriptors on endpoint\n");
@@ -1481,6 +1482,11 @@ static int acm_reset_resume(struct usb_interface *intf) 
		USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \

		USB_CDC_ACM_PROTO_VENDOR)



#define SAMSUNG_PCSUITE_ACM_INFO(x) \

		USB_DEVICE_AND_INTERFACE_INFO(0x04e7, x, \

		USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, \

		USB_CDC_ACM_PROTO_VENDOR)



/*

 * USB driver structure.

 */
@@ -1591,6 +1597,17 @@ static const struct usb_device_id acm_ids[] = { 
	{ NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */

	{ NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */

	{ NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */

	{ NOKIA_PCSUITE_ACM_INFO(0x0178), }, /* Nokia E63 */

	{ NOKIA_PCSUITE_ACM_INFO(0x010e), }, /* Nokia E75 */

	{ NOKIA_PCSUITE_ACM_INFO(0x02d9), }, /* Nokia 6760 Slide */

	{ NOKIA_PCSUITE_ACM_INFO(0x01d0), }, /* Nokia E52 */

	{ NOKIA_PCSUITE_ACM_INFO(0x0223), }, /* Nokia E72 */

	{ NOKIA_PCSUITE_ACM_INFO(0x0275), }, /* Nokia X6 */

	{ NOKIA_PCSUITE_ACM_INFO(0x026c), }, /* Nokia N97 Mini */

	{ NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */

	{ NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */

	{ NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */

	{ SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */



	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
@@ -1599,6 +1616,10 @@ static const struct usb_device_id acm_ids[] = { 
	.driver_info = NOT_A_MODEM,

       	},



	/* control interfaces without any protocol set */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_PROTO_NONE) },



	/* control interfaces with various AT-command sets */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_ACM_PROTO_AT_V25TER) },

drivers/usb/core/message.c

+11 −11
Original line number Diff line number Diff line
@@ -1724,6 +1724,15 @@ free_interfaces: 
	if (ret)

		goto free_interfaces;



	/* if it's already configured, clear out old state first.

	 * getting rid of old interfaces means unbinding their drivers.

	 */

	if (dev->state != USB_STATE_ADDRESS)

		usb_disable_device(dev, 1);	/* Skip ep0 */



	/* Get rid of pending async Set-Config requests for this device */

	cancel_async_set_config(dev);



	/* Make sure we have bandwidth (and available HCD resources) for this

	 * configuration.  Remove endpoints from the schedule if we're dropping

	 * this configuration to set configuration 0.  After this point, the
@@ -1733,20 +1742,11 @@ free_interfaces: 
	mutex_lock(&hcd->bandwidth_mutex);

	ret = usb_hcd_alloc_bandwidth(dev, cp, NULL, NULL);

	if (ret < 0) {

		usb_autosuspend_device(dev);

		mutex_unlock(&hcd->bandwidth_mutex);

		usb_autosuspend_device(dev);

		goto free_interfaces;

	}



	/* if it's already configured, clear out old state first.

	 * getting rid of old interfaces means unbinding their drivers.

	 */

	if (dev->state != USB_STATE_ADDRESS)

		usb_disable_device(dev, 1);	/* Skip ep0 */



	/* Get rid of pending async Set-Config requests for this device */

	cancel_async_set_config(dev);



	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,

			      NULL, 0, USB_CTRL_SET_TIMEOUT);
@@ -1761,8 +1761,8 @@ free_interfaces: 
	if (!cp) {

		usb_set_device_state(dev, USB_STATE_ADDRESS);

		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);

		usb_autosuspend_device(dev);

		mutex_unlock(&hcd->bandwidth_mutex);

		usb_autosuspend_device(dev);

		goto free_interfaces;

	}

	mutex_unlock(&hcd->bandwidth_mutex);

drivers/usb/gadget/rndis.c

+8 −4
Original line number Diff line number Diff line
@@ -293,9 +293,13 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, 
	/* mandatory */

	case OID_GEN_VENDOR_DESCRIPTION:

		pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);

		if ( rndis_per_dev_params [configNr].vendorDescr ) {

			length = strlen (rndis_per_dev_params [configNr].vendorDescr);

			memcpy (outbuf,

				rndis_per_dev_params [configNr].vendorDescr, length);

		} else {

			outbuf[0] = 0;

		}

		retval = 0;

		break;
@@ -1148,7 +1152,7 @@ static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS]; 
#endif	/* CONFIG_USB_GADGET_DEBUG_FILES */





int __init rndis_init (void)

int rndis_init(void)

{

	u8 i;

drivers/usb/gadget/rndis.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int rndis_signal_disconnect (int configNr); 
int  rndis_state (int configNr);

extern void rndis_set_host_mac (int configNr, const u8 *addr);



int __devinit rndis_init (void);

int rndis_init(void);

void rndis_exit (void);



#endif  /* _LINUX_RNDIS_H */