summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/ehci.c9
-rw-r--r--sys/dev/usb/ohci.c8
-rw-r--r--sys/dev/usb/uhci.c8
3 files changed, 22 insertions, 3 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 0718dac34f2..4986271eb89 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.105 2009/11/24 00:31:13 jakemsr Exp $ */
+/* $OpenBSD: ehci.c,v 1.106 2009/11/26 12:27:48 deraadt Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@@ -1040,6 +1040,13 @@ ehci_activate(struct device *self, int act)
rv = config_deactivate(sc->sc_child);
sc->sc_dying = 1;
break;
+ case DVACT_SUSPEND:
+ ehci_power(PWR_SUSPEND, sc);
+ break;
+ case DVACT_RESUME:
+ ehci_power(PWR_RESUME, sc);
+ rv = config_activate_children(self, act);
+ break;
}
return (rv);
}
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 5a58262dcc1..58e9e1d6b06 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.93 2009/11/04 19:14:10 kettenis Exp $ */
+/* $OpenBSD: ohci.c,v 1.94 2009/11/26 12:27:48 deraadt Exp $ */
/* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -320,6 +320,12 @@ ohci_activate(struct device *self, int act)
rv = config_deactivate(sc->sc_child);
sc->sc_dying = 1;
break;
+ case DVACT_SUSPEND:
+ ohci_power(PWR_SUSPEND, sc);
+ break;
+ case DVACT_RESUME:
+ ohci_power(PWR_RESUME, sc);
+ break;
}
return (rv);
}
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 58c24368ad3..71b1e014ccd 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.73 2009/11/04 19:14:10 kettenis Exp $ */
+/* $OpenBSD: uhci.c,v 1.74 2009/11/26 12:27:48 deraadt Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -516,6 +516,12 @@ uhci_activate(struct device *self, int act)
if (sc->sc_child != NULL)
rv = config_deactivate(sc->sc_child);
break;
+ case DVACT_SUSPEND:
+ uhci_power(PWR_SUSPEND, sc);
+ break;
+ case DVACT_RESUME:
+ uhci_power(PWR_RESUME, sc);
+ break;
}
return (rv);
}