Commit bb0851ff 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: (25 commits)
  USB: s3c2410 gadget: ensure vbus pin in input mode during read
  USB: s3c2410 gadget: allow sharing of vbus irq
  USB: s3c2410 gadget: Header move fixups
  USB: usb-storage: unusual_devs entry for JetFlash TS1GJF2A
  USB: fix up EHCI startup synchronization
  USB: make the microtek driver and HAL cooperate
  USB: uevent environment key fix
  USB: keep track of whether interface sysfs files exist
  USB: sierra: new product id
  USB HCD: avoid duplicate local_irq_disable()
  USB: mailing lists have changed
  USB: remove USB HUB entry from MAINTAINERS
  USB: fix directory references in usb/README
  USB: add support for an older firmware revision for the Nikon D200
  USB: FIx locks and urb->status in adutux (updated)
  USB: power-management documenation update
  USB: Fix signr comment in usbdevice_fs.h
  usbserial: fix inconsistent lock state
  USB: fix usbled disconnect read race #2
  USB: free memory when writing fails in usb/serial/mos7840.c
  ...
parents 34f2c1c3 5f629ad7

Documentation/usb/power-management.txt

+8 −0
Original line number Diff line number Diff line
@@ -278,6 +278,14 @@ optional. The methods' jobs are quite simple: 
	(although the interfaces will be in the same altsettings as

	before the suspend).



If the device is disconnected or powered down while it is suspended,

the disconnect method will be called instead of the resume or

reset_resume method.  This is also quite likely to happen when

waking up from hibernation, as many systems do not maintain suspend

current to the USB host controllers during hibernation.  (It's

possible to work around the hibernation-forces-disconnect problem by

using the USB Persist facility.)



The reset_resume method is used by the USB Persist facility (see

Documentation/usb/persist.txt) and it can also be used under certain

circumstances when CONFIG_USB_PERSIST is not enabled.  Currently, if a

MAINTAINERS

+35 −66
Original line number Diff line number Diff line
@@ -323,8 +323,7 @@ S: Maintained 
ALCATEL SPEEDTOUCH USB DRIVER

P:	Duncan Sands

M:	duncan.sands@free.fr

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:	linux-usb@vger.kernel.org

W:	http://www.linux-usb.org/SpeedTouch/

S:	Maintained
@@ -1043,7 +1042,7 @@ S: Maintained 
CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER

P:	Lennert Buytenhek

M:	kernel@wantstofly.org

L:	linux-usb-devel@lists.sourceforge.net

L:	linux-usb@vger.kernel.org

S:	Maintained



CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
@@ -1552,7 +1551,7 @@ S: Maintained 
FREESCALE HIGHSPEED USB DEVICE DRIVER

P:	Li Yang

M:	leoli@freescale.com

L:	linux-usb-devel@lists.sourceforge.net

L:	linux-usb@vger.kernel.org

L:	linuxppc-dev@ozlabs.org

S:	Maintained
@@ -3810,22 +3809,20 @@ S: Maintained 
USB ACM DRIVER

P:	Oliver Neukum

M:	oliver@neukum.name

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:	linux-usb@vger.kernel.org

S:	Maintained



USB BLOCK DRIVER (UB ub)

P:	Pete Zaitcev

M:	zaitcev@redhat.com

L:	linux-kernel@vger.kernel.org

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Supported



USB CDC ETHERNET DRIVER

P:	Greg Kroah-Hartman

M:	greg@kroah.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained

W:	http://www.kroah.com/linux-usb/
@@ -3839,13 +3836,13 @@ S: Maintained 
USB EHCI DRIVER

P:	David Brownell

M:	dbrownell@users.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Odd Fixes



USB ET61X[12]51 DRIVER

P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://www.linux-projects.org

S:	Maintained
@@ -3853,41 +3850,33 @@ S: Maintained 
USB GADGET/PERIPHERAL SUBSYSTEM

P:	David Brownell

M:	dbrownell@users.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://www.linux-usb.org/gadget

S:	Maintained



USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)

P:	Jiri Kosina

M:	jkosina@suse.cz

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git

S:	Maintained



USB HUB DRIVER

P:	Johannes Erdfelt

M:	johannes@erdfelt.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

S:	Maintained



USB ISP116X DRIVER

P:	Olav Kongas

M:	ok@artecdesign.ee

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB KAWASAKI LSI DRIVER

P:	Oliver Neukum

M:	oliver@neukum.name

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB MASS STORAGE DRIVER

P:	Matthew Dharm

M:	mdharm-usb@one-eyed-alien.net

L:	linux-usb-users@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	usb-storage@lists.one-eyed-alien.net

S:	Maintained

W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/
@@ -3895,28 +3884,26 @@ W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ 
USB OHCI DRIVER

P:	David Brownell

M:	dbrownell@users.sourceforge.net

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Odd Fixes



USB OPTION-CARD DRIVER

P:	Matthias Urlichs

M:	smurf@smurf.noris.de

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB OV511 DRIVER

P:	Mark McClelland

M:	mmcclell@bigfoot.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://alpha.dyndns.org/ov511/

S:	Maintained



USB PEGASUS DRIVER

P:	Petko Manolov

M:	petkan@users.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://pegasus2.sourceforge.net/

S:	Maintained
@@ -3924,14 +3911,13 @@ S: Maintained 
USB PRINTER DRIVER (usblp)

P:	Pete Zaitcev

M:	zaitcev@redhat.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Supported



USB RTL8150 DRIVER

P:	Petko Manolov

M:	petkan@users.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://pegasus2.sourceforge.net/

S:	Maintained
@@ -3939,8 +3925,7 @@ S: Maintained 
USB SE401 DRIVER

P:	Jeroen Vreeken

M:	pe1rxq@amsat.org

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://www.chello.nl/~j.vreeken/se401/

S:	Maintained
@@ -3954,72 +3939,59 @@ USB SERIAL DIGI ACCELEPORT DRIVER 
P:	Peter Berger and Al Borchers

M:	pberger@brimson.com

M:	alborchers@steinerpoint.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB SERIAL DRIVER

P:	Greg Kroah-Hartman

M:	gregkh@suse.de

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Supported



USB SERIAL BELKIN F5U103 DRIVER

P:	William Greathouse

M:	wgreathouse@smva.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB SERIAL CYPRESS M8 DRIVER

P:	Lonnie Mendez

M:	dignome@gmail.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained

W:	http://geocities.com/i0xox0i

W:	http://firstlight.net/cvs



USB SERIAL CYBERJACK PINPAD/E-COM DRIVER

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

S:	Maintained



USB AUERSWALD DRIVER

P:	Wolfgang Muees

M:	wolfgang@iksw-muees.de

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER

P:	Gary Brubaker

M:	xavyer@ix.netcom.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB SERIAL KEYSPAN DRIVER

P:	Greg Kroah-Hartman

M:	greg@kroah.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://www.kroah.com/linux/

S:	Maintained



USB SERIAL WHITEHEAT DRIVER

P:	Support Department

M:	support@connecttech.com

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://www.connecttech.com

S:	Supported



USB SN9C1xx DRIVER

P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://www.linux-projects.org

S:	Maintained
@@ -4027,8 +3999,7 @@ S: Maintained 
USB SUBSYSTEM

P:	Greg Kroah-Hartman

M:	gregkh@suse.de

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://www.linux-usb.org

T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

S:	Supported
@@ -4036,8 +4007,7 @@ S: Supported 
USB UHCI DRIVER

P:	Alan Stern

M:	stern@rowland.harvard.edu

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

S:	Maintained



USB "USBNET" DRIVER FRAMEWORK
@@ -4050,7 +4020,7 @@ S: Maintained 
USB W996[87]CF DRIVER

P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://www.linux-projects.org

S:	Maintained
@@ -4058,7 +4028,7 @@ S: Maintained 
USB ZC0301 DRIVER

P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://www.linux-projects.org

S:	Maintained
@@ -4066,15 +4036,14 @@ S: Maintained 
USB ZD1201 DRIVER

P:	Jeroen Vreeken

M:	pe1rxq@amsat.org

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

W:	http://linux-lc100020.sourceforge.net

S:	Maintained



USB ZR364XX DRIVER

P:	Antoine Jacquet

M:	royale@zerezo.com

L:	linux-usb-devel@lists.sourceforge.net

L:      linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://royale.zerezo.com/zr364xx/

S:	Maintained

drivers/usb/README

+3 −3
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ first subdirectory in the list below that it fits into. 


image/		- This is for still image drivers, like scanners or

		  digital cameras.

input/		- This is for any driver that uses the input subsystem,

../input/	- This is for any driver that uses the input subsystem,

		  like keyboard, mice, touchscreens, tablets, etc.

media/		- This is for multimedia drivers, like video cameras,

../media/	- This is for multimedia drivers, like video cameras,

		  radios, and any other drivers that talk to the v4l

		  subsystem.

net/		- This is for network drivers.

../net/		- This is for network drivers.

serial/		- This is for USB to serial drivers.

storage/	- This is for USB mass-storage drivers.

class/		- This is for all USB device drivers that do not fit

drivers/usb/core/driver.c

+0 −11
Original line number Diff line number Diff line
@@ -585,9 +585,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env) 
{

	struct usb_device *usb_dev;



	if (!dev)

		return -ENODEV;



	/* driver is often null here; dev_dbg() would oops */

	pr_debug ("usb %s: uevent\n", dev->bus_id);
@@ -631,14 +628,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env) 
			   usb_dev->descriptor.bDeviceProtocol))

		return -ENOMEM;



	if (add_uevent_var(env, "BUSNUM=%03d",

			   usb_dev->bus->busnum))

		return -ENOMEM;



	if (add_uevent_var(env, "DEVNUM=%03d",

			   usb_dev->devnum))

		return -ENOMEM;



	return 0;

}

drivers/usb/core/hcd.c

+2 −1
Original line number Diff line number Diff line
@@ -1311,8 +1311,8 @@ void usb_hcd_flush_endpoint(struct usb_device *udev, 
	hcd = bus_to_hcd(udev->bus);



	/* No more submits can occur */

rescan:

	spin_lock_irq(&hcd_urb_list_lock);

rescan:

	list_for_each_entry (urb, &ep->urb_list, urb_list) {

		int	is_in;
@@ -1345,6 +1345,7 @@ rescan: 
		usb_put_urb (urb);



		/* list contents may have changed */

		spin_lock(&hcd_urb_list_lock);

		goto rescan;

	}

	spin_unlock_irq(&hcd_urb_list_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE