svn commit: r231230 - stable/8/sys/dev/usb/controller
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Feb 8 22:27:08 UTC 2012
Author: hselasky
Date: Wed Feb 8 22:27:07 2012
New Revision: 231230
URL: http://svn.freebsd.org/changeset/base/231230
Log:
MFC r229317:
Fix support for suspend and resume.
Modified:
stable/8/sys/dev/usb/controller/usb_controller.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- stable/8/sys/dev/usb/controller/usb_controller.c Wed Feb 8 22:05:26 2012 (r231229)
+++ stable/8/sys/dev/usb/controller/usb_controller.c Wed Feb 8 22:27:07 2012 (r231230)
@@ -472,10 +472,18 @@ usb_bus_resume(struct usb_proc_msg *pm)
if (bus->methods->set_hw_power != NULL)
(bus->methods->set_hw_power) (bus);
+ /* restore USB configuration to index 0 */
err = usbd_set_config_index(udev, 0);
if (err)
device_printf(bus->bdev, "Could not configure root HUB\n");
+ /* probe and attach */
+ err = usb_probe_and_attach(udev, USB_IFACE_INDEX_ANY);
+ if (err) {
+ device_printf(bus->bdev, "Could not probe and "
+ "attach root HUB\n");
+ }
+
usbd_enum_unlock(udev);
USB_BUS_LOCK(bus);
More information about the svn-src-stable-8
mailing list