diff options
| -rw-r--r-- | sys/dev/ata/wd.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 596d160829b..40b406ae01f 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.89 2010/08/28 20:23:22 matthew Exp $ */ +/* $OpenBSD: wd.c,v 1.90 2010/08/31 17:00:32 deraadt Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -382,12 +382,6 @@ wdactivate(struct device *self, int act) switch (act) { case DVACT_ACTIVATE: break; - - case DVACT_DEACTIVATE: - /* - * Nothing to do; we key off the device's DVF_ACTIVATE. - */ - break; case DVACT_SUSPEND: wd_flushcache(wd, AT_POLL); wd_standby(wd, AT_POLL); @@ -404,6 +398,11 @@ wdactivate(struct device *self, int act) wdc_reset_channel(wd->drvp); wdc_enable_intr(wd->drvp->chnl_softc); break; + case DVACT_DEACTIVATE: + /* + * Nothing to do; we key off the device's DVF_ACTIVATE. + */ + break; } return (rv); } diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 38263538f73..87740999011 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.97 2010/08/30 21:30:16 deraadt Exp $ */ +/* $OpenBSD: ohci.c,v 1.98 2010/08/31 16:59:47 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 $ */ @@ -333,11 +333,6 @@ ohci_activate(struct device *self, int act) switch (act) { case DVACT_ACTIVATE: break; - case DVACT_DEACTIVATE: - if (sc->sc_child != NULL) - rv = config_deactivate(sc->sc_child); - sc->sc_dying = 1; - break; case DVACT_SUSPEND: sc->sc_bus.use_polling++; reg = OREAD4(sc, OHCI_CONTROL) & ~OHCI_HCFS_MASK; @@ -392,6 +387,11 @@ ohci_activate(struct device *self, int act) sc->sc_control = sc->sc_intre = sc->sc_ival = 0; sc->sc_bus.use_polling--; break; + case DVACT_DEACTIVATE: + if (sc->sc_child != NULL) + rv = config_deactivate(sc->sc_child); + sc->sc_dying = 1; + break; } return (rv); } |