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

Commit a2702834 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: don't rebind drivers after failed resume or reset
  USB: fix memory leak in cdc-acm
  USB: Unusual dev for Mio moov 330 gps
  USB: cdc-wdm: make module autoload work
  USB: Fix unneeded endpoint check in pxa27x_udc
  usb/gadget: fix kernel-doc warning
  USB: Speedtouch: add pre_reset and post_reset routines
  USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
  USB: support Huawei data card product IDs
  USB: add ZTE MF626 USB GSM modem entry
  USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
  USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
  USB: ohci: add support for tmio-ohci cell
parents 45432371 6c640945

drivers/usb/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ config USB_ARCH_HAS_OHCI 
	default y if PXA3xx

	default y if ARCH_EP93XX

	default y if ARCH_AT91

	default y if ARCH_PNX4008

	default y if ARCH_PNX4008 && I2C

	default y if MFD_TC6393XB

	# PPC:

	default y if STB03xxx

	default y if PPC_MPC52xx

drivers/usb/atm/speedtch.c

+12 −0
Original line number Diff line number Diff line
@@ -722,6 +722,16 @@ static void speedtch_atm_stop(struct usbatm_data *usbatm, struct atm_dev *atm_de 
	flush_scheduled_work();

}



static int speedtch_pre_reset(struct usb_interface *intf)

{

	return 0;

}



static int speedtch_post_reset(struct usb_interface *intf)

{

	return 0;

}





/**********

**  USB  **
@@ -740,6 +750,8 @@ static struct usb_driver speedtch_usb_driver = { 
	.name		= speedtch_driver_name,

	.probe		= speedtch_usb_probe,

	.disconnect	= usbatm_usb_disconnect,

	.pre_reset	= speedtch_pre_reset,

	.post_reset	= speedtch_post_reset,

	.id_table	= speedtch_usb_ids

};

drivers/usb/class/cdc-acm.c

+2 −1
Original line number Diff line number Diff line
@@ -849,9 +849,10 @@ static void acm_write_buffers_free(struct acm *acm) 
{

	int i;

	struct acm_wb *wb;

	struct usb_device *usb_dev = interface_to_usbdev(acm->control);



	for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++) {

		usb_buffer_free(acm->dev, acm->writesize, wb->buf, wb->dmah);

		usb_buffer_free(usb_dev, acm->writesize, wb->buf, wb->dmah);

	}

}

drivers/usb/class/cdc-wdm.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static struct usb_device_id wdm_ids[] = { 
	{ }

};



MODULE_DEVICE_TABLE (usb, wdm_ids);



#define WDM_MINOR_BASE	176

drivers/usb/core/driver.c

+2 −1
Original line number Diff line number Diff line
@@ -1610,6 +1610,7 @@ int usb_external_resume_device(struct usb_device *udev) 
	status = usb_resume_both(udev);

	udev->last_busy = jiffies;

	usb_pm_unlock(udev);

	if (status == 0)

		do_unbind_rebind(udev, DO_REBIND);



	/* Now that the device is awake, we can start trying to autosuspend