diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-08 21:47:52 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-08 21:47:52 +0000 |
| commit | 4a7a1f17c7d6f8e79f29d4fde2ba5faf09b7f5a8 (patch) | |
| tree | fdc5670bf4d0a8cd810fe846698cb565f1f51cb9 /sys/dev/cardbus | |
| parent | c7f240fd53223122e6fe8cee52bb76b460263763 (diff) | |
Revamp the sequences for suspend/hibernate -> resume so that the code
paths are reflexive. It is now possible to fail part-way through a
suspend sequence, and recover along the resume code path.
Split DVACT_SUSPEND by adding a new DVACT_POWERDOWN method is used
after hibernate (and suspend too) to finish the job. Some drivers
must be converted at the same time to use this instead of shutdown hooks
(the others will follow at a later time)
ok kettenis mlarkin
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/ehci_cardbus.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index bd4d2b913c8..af54433b740 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_cardbus.c,v 1.15 2010/03/27 21:40:13 jsg Exp $ */ +/* $OpenBSD: ehci_cardbus.c,v 1.16 2012/10/08 21:47:50 deraadt Exp $ */ /* $NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $ */ /* @@ -73,7 +73,7 @@ struct ehci_cardbus_softc { struct cfattach ehci_cardbus_ca = { sizeof(struct ehci_cardbus_softc), ehci_cardbus_match, - ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate + ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate }; #define CARDBUS_CBMEM PCI_CBMEM @@ -161,8 +161,6 @@ ehci_cardbus_attach(struct device *parent, struct device *self, void *aux) return; } - sc->sc.sc_shutdownhook = shutdownhook_establish(ehci_shutdown, &sc->sc); - /* Attach usb device. */ sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus, usbctlprint); @@ -189,4 +187,3 @@ ehci_cardbus_detach(struct device *self, int flags) } return (0); } - |