svn commit: r255693 - stable/9/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Thu Sep 19 05:40:49 2013
New Revision: 255693
URL: http://svnweb.freebsd.org/changeset/base/255693

Log:
  MFC r255488:
  Don't issue USB resume signalling in USB device mode, if the USB power
  mode is ON and suspend is detected. This confuses iPads running in USB
  host mode at least.

Modified:
  stable/9/sys/dev/usb/usb_hub.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/9/sys/dev/usb/usb_hub.c	Thu Sep 19 05:07:51 2013	(r255692)
+++ stable/9/sys/dev/usb/usb_hub.c	Thu Sep 19 05:40:49 2013	(r255693)
@@ -2067,7 +2067,8 @@ usbd_transfer_power_ref(struct usb_xfer 
 static uint8_t
 usb_peer_should_wakeup(struct usb_device *udev)
 {
-	return ((udev->power_mode == USB_POWER_MODE_ON) ||
+	return (((udev->power_mode == USB_POWER_MODE_ON) &&
+	    (udev->flags.usb_mode == USB_MODE_HOST)) ||
 	    (udev->driver_added_refcount != udev->bus->driver_added_refcount) ||
 	    (udev->re_enumerate_wait != 0) ||
 	    (udev->pwr_save.type_refs[UE_ISOCHRONOUS] != 0) ||