summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2003-08-18 21:59:24 +0000
committerWarner Losh <imp@FreeBSD.org>2003-08-18 21:59:24 +0000
commitf2d72e24b394caa0ea16ab56f0fb6bada5e458ac (patch)
treea9eba85e164a08850d88b0beb6fcb389b446d61d
parent6a4b58230c4ca4ea35d5d00fc7e378cb601e0a51 (diff)
Notes
-rw-r--r--sys/dev/pccbb/pccbb.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index a3435b4fcdcc..9b471239a77a 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -1376,8 +1376,7 @@ cbb_cardbus_power_enable_socket(device_t brdev, device_t child)
struct cbb_softc *sc = device_get_softc(brdev);
int err;
- if ((cbb_get(sc, CBB_SOCKET_STATE) & CBB_STATE_CD) ==
- CBB_STATE_CD)
+ if ((cbb_get(sc, CBB_SOCKET_STATE) & CBB_STATE_CD) != 0)
return (ENODEV);
err = cbb_do_power(brdev);
@@ -2027,8 +2026,8 @@ cbb_child_present(device_t self)
uint32_t sockstate;
sockstate = cbb_get(sc, CBB_SOCKET_STATE);
- return ((sockstate & CBB_STATE_CD) != 0 &&
- (sc->flags & CBB_CARD_OK) != 0);
+ return ((sockstate & CBB_STATE_CD) == 0 &&
+ (sc->flags & CBB_CARD_OK) == CBB_CARD_OK);
}
static device_method_t cbb_methods[] = {