diff options
| author | Robert Nagy <robert@cvs.openbsd.org> | 2005-05-28 00:46:47 +0000 |
|---|---|---|
| committer | Robert Nagy <robert@cvs.openbsd.org> | 2005-05-28 00:46:47 +0000 |
| commit | 72f7a1cee07251e9d0505bd26f6366336761cda9 (patch) | |
| tree | 148d17b01a3a357ba0bf9668d34d1c3a16c0e41b /sys/dev | |
| parent | 8741d6533d128f7f696f777bb21921020d4f9d8e (diff) | |
make sure to enable socket on resume.
in order for the enable to work disable the socket on suspend.
ok jsg@, mickey@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/if_ath_cardbus.c | 16 | ||||
| -rw-r--r-- | sys/dev/ic/athvar.h | 3 |
2 files changed, 5 insertions, 14 deletions
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c index 4e6cad90e50..2b0df66f76c 100644 --- a/sys/dev/cardbus/if_ath_cardbus.c +++ b/sys/dev/cardbus/if_ath_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_cardbus.c,v 1.3 2005/02/16 14:29:14 aaron Exp $ */ +/* $OpenBSD: if_ath_cardbus.c,v 1.4 2005/05/28 00:46:46 robert Exp $ */ /* $NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */ /* @@ -282,21 +282,11 @@ ath_cardbus_disable(struct ath_softc *sc) void ath_cardbus_power(struct ath_softc *sc, int why) { - struct ath_cardbus_softc *csc = (void *) sc; printf("%s: ath_cardbus_power\n", sc->sc_dev.dv_xname); - if (why == PWR_RESUME) { - /* - * Give the PCI configuration registers a kick - * in the head. - */ -#ifdef DIAGNOSTIC - if (ATH_IS_ENABLED(sc) == 0) - panic("ath_cardbus_power"); -#endif - ath_cardbus_setup(csc); - } + if (why == PWR_RESUME) + ath_enable(sc); } void diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index f3838c38e72..84ba54860ea 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athvar.h,v 1.10 2005/05/27 09:53:55 reyk Exp $ */ +/* $OpenBSD: athvar.h,v 1.11 2005/05/28 00:46:46 robert Exp $ */ /* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */ /*- @@ -403,6 +403,7 @@ typedef unsigned long u_intptr_t; int ath_attach(u_int16_t, struct ath_softc *); int ath_detach(struct ath_softc *, int); +int ath_enable(struct ath_softc *); void ath_resume(struct ath_softc *, int); void ath_suspend(struct ath_softc *, int); #ifdef __NetBSD__ |