diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-05-05 15:36:23 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-05-05 15:36:23 +0000 |
| commit | 9a5ee5e7f1215ee4dc0f22592f0b6c02700d0f35 (patch) | |
| tree | 3b824f3d7cff91427680192e6b5410a43bc2846a /sys/dev/usb/usb_generic.c | |
| parent | d011bcaef90070eaabcb2a7ee1ce1e2e49d6bf24 (diff) | |
| download | FreeBSD-src-9a5ee5e7f1215ee4dc0f22592f0b6c02700d0f35.zip FreeBSD-src-9a5ee5e7f1215ee4dc0f22592f0b6c02700d0f35.tar.gz | |
Revert part of r191494 which used the udev state to mark suspending, this needs
to be set via two variables (peer_suspended and self_suspended) and can not be
merged into one.
Submitted by: Hans Petter Selasky
Pointy hat: me
Diffstat (limited to 'sys/dev/usb/usb_generic.c')
| -rw-r--r-- | sys/dev/usb/usb_generic.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index c3fe72d..d7d73b8 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -823,11 +823,7 @@ usb2_gen_fill_deviceinfo(struct usb2_fifo *f, struct usb2_device_info *di) di->udi_speed = udev->speed; di->udi_mode = udev->flags.usb2_mode; di->udi_power_mode = udev->power_mode; - if (udev->state == USB_STATE_SUSPENDED) { - di->udi_suspended = 1; - } else { - di->udi_suspended = 0; - } + di->udi_suspended = udev->flags.peer_suspended; hub = udev->parent_hub; if (hub) { |
