Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  MAINTAINERS: add myself as maintainer of USB/IP
  usb: r8a66597-hcd: fix cannot detect low/full speed device
  USB: ehci-ath79: fix a NULL pointer dereference
  USB: Add new FT232H chip to drivers/usb/serial/ftdi_sio.c
  usb/isp1760: Fix bug preventing the unlinking of control urbs
  USB: Fix up URB error codes to reflect implementation.
  xhci: Always set urb->status to zero for isoc endpoints.
  xhci: Add reset on resume quirk for asrock p67 host
  xHCI 1.0: Incompatible Device Error
  USB: don't let errors prevent system sleep
  USB: don't let the hub driver prevent system sleep
  USB: change maintainership of ohci-hcd and ehci-hcd
  xHCI 1.0: Force Stopped Event(FSE)
  xhci: Don't warn about zeroed bMaxBurst descriptor field.
  USB: Free bandwidth when usb_disable_device is called.
  xhci: Reject double add of active endpoints.
  USB: TI 3410/5052 USB Serial Driver: Fix mem leak when firmware is too big.
  usb: musb: gadget: clear TXPKTRDY flag when set FLUSHFIFO
  usb: musb: host: compare status for negative error values

diff --combined MAINTAINERS
index f0358cd,1f93f50..d2dcef7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1889,6 -1889,7 +1889,6 @@@ L:      cpufreq@vger.kernel.or
  W:    http://www.codemonkey.org.uk/projects/cpufreq/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
  S:    Maintained
 -F:    arch/x86/kernel/cpu/cpufreq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -2291,7 -2292,8 +2291,7 @@@ F:      drivers/scsi/eata_pio.
  
  EBTABLES
  M:    Bart De Schuymer <bart.de.schuymer@pandora.be>
 -L:    ebtables-user@lists.sourceforge.net
 -L:    ebtables-devel@lists.sourceforge.net
 +L:    netfilter-devel@vger.kernel.org
  W:    http://ebtables.sourceforge.net/
  S:    Maintained
  F:    include/linux/netfilter_bridge/ebt_*.h
@@@ -3818,12 -3820,6 +3818,12 @@@ S:    Maintaine
  F:    drivers/leds/
  F:    include/linux/leds.h
  
 +LEGACY EEPROM DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +S:    Maintained
 +F:    Documentation/misc-devices/eeprom
 +F:    drivers/misc/eeprom/eeprom.c
 +
  LEGO USB Tower driver
  M:    Juergen Stuber <starblue@users.sourceforge.net>
  L:    legousb-devel@lists.sourceforge.net
@@@ -4149,7 -4145,7 +4149,7 @@@ F:      include/linux/mm.
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
  M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
  L:    linux-mm@kvack.org
@@@ -4894,7 -4890,7 +4894,7 @@@ F:      mm/percpu*.
  F:    arch/*/include/asm/percpu.h
  
  PER-TASK DELAY ACCOUNTING
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  S:    Maintained
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
@@@ -6102,7 -6098,7 +6102,7 @@@ F:      include/target
  F:    Documentation/target/
  
  TASKSTATS STATISTICS INTERFACE
 -M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 +M:    Balbir Singh <bsingharora@gmail.com>
  S:    Maintained
  F:    Documentation/accounting/taskstats*
  F:    include/linux/taskstats*
@@@ -6434,8 -6430,9 +6434,9 @@@ S:      Maintaine
  F:    drivers/usb/misc/rio500*
  
  USB EHCI DRIVER
+ M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
- S:    Orphan
+ S:    Maintained
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
@@@ -6462,9 -6459,15 +6463,15 @@@ M:    Jiri Kosina <jkosina@suse.cz
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
 -F:    Documentation/usb/hiddev.txt
 +F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
+ USB/IP DRIVERS
+ M:    Matt Mooney <mfm@muteddisk.com>
+ L:    linux-usb@vger.kernel.org
+ S:    Maintained
+ F:    drivers/staging/usbip/
+ 
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -6494,8 -6497,9 +6501,9 @@@ S:      Maintaine
  F:    sound/usb/midi.*
  
  USB OHCI DRIVER
+ M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
- S:    Orphan
+ S:    Maintained
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
@@@ -6721,14 -6725,6 +6729,14 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
 +VIDEOBUF2 FRAMEWORK
 +M:    Pawel Osciak <pawel@osciak.com>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/video/videobuf2-*
 +F:    include/media/videobuf2-*
 +
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -7006,13 -7002,6 +7014,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/platform/x86
  
 +X86 MCE INFRASTRUCTURE
 +M:    Tony Luck <tony.luck@intel.com>
 +M:    Borislav Petkov <bp@amd64.org>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    arch/x86/kernel/cpu/mcheck/*
 +
  XEN HYPERVISOR INTERFACE
  M:    Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --combined drivers/usb/core/driver.c
index aa3cc46,81add81..34e3da5
--- 1/drivers/usb/core/driver.c
--- 2/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@@ -375,7 -375,7 +375,7 @@@ static int usb_unbind_interface(struct 
                 * Just re-enable it without affecting the endpoint toggles.
                 */
                usb_enable_interface(udev, intf, false);
 -      } else if (!error && !intf->dev.power.in_suspend) {
 +      } else if (!error && !intf->dev.power.is_prepared) {
                r = usb_set_interface(udev, intf->altsetting[0].
                                desc.bInterfaceNumber, 0);
                if (r < 0)
@@@ -960,7 -960,7 +960,7 @@@ void usb_rebind_intf(struct usb_interfa
        }
  
        /* Try to rebind the interface */
 -      if (!intf->dev.power.in_suspend) {
 +      if (!intf->dev.power.is_prepared) {
                intf->needs_binding = 0;
                rc = device_attach(&intf->dev);
                if (rc < 0)
@@@ -1107,7 -1107,7 +1107,7 @@@ static int usb_resume_interface(struct 
        if (intf->condition == USB_INTERFACE_UNBOUND) {
  
                /* Carry out a deferred switch to altsetting 0 */
 -              if (intf->needs_altsetting0 && !intf->dev.power.in_suspend) {
 +              if (intf->needs_altsetting0 && !intf->dev.power.is_prepared) {
                        usb_set_interface(udev, intf->altsetting[0].
                                        desc.bInterfaceNumber, 0);
                        intf->needs_altsetting0 = 0;
@@@ -1187,13 -1187,22 +1187,22 @@@ static int usb_suspend_both(struct usb_
                for (i = n - 1; i >= 0; --i) {
                        intf = udev->actconfig->interface[i];
                        status = usb_suspend_interface(udev, intf, msg);
+ 
+                       /* Ignore errors during system sleep transitions */
+                       if (!(msg.event & PM_EVENT_AUTO))
+                               status = 0;
                        if (status != 0)
                                break;
                }
        }
-       if (status == 0)
+       if (status == 0) {
                status = usb_suspend_device(udev, msg);
  
+               /* Again, ignore errors during system sleep transitions */
+               if (!(msg.event & PM_EVENT_AUTO))
+                       status = 0;
+       }
+ 
        /* If the suspend failed, resume interfaces that did get suspended */
        if (status != 0) {
                msg.event ^= (PM_EVENT_SUSPEND | PM_EVENT_RESUME);