summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2008-12-31 07:41:42 +0000
committerimp <imp@FreeBSD.org>2008-12-31 07:41:42 +0000
commitc625343c9a898ae660944f287951a55b498230dd (patch)
tree6d61e3c9472fb4dbb02fa89d10c582fcefae7af5 /sys
parent9e74a27aafba30b2c36d236fadf4d89914cdc4f8 (diff)
downloadFreeBSD-src-c625343c9a898ae660944f287951a55b498230dd.zip
FreeBSD-src-c625343c9a898ae660944f287951a55b498230dd.tar.gz
When no driver attaches to a card, don't power down the card. We can
now read config registers of cardbus cards that are inserted, but aren't attached to a driver. Also, add a power related comment...
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cardbus/cardbus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 8d9a72f..535e272 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -207,7 +207,7 @@ cardbus_attach_card(device_t cbdev)
}
if (cardattached > 0)
return (0);
- POWER_DISABLE_SOCKET(brdev, cbdev);
+/* POWER_DISABLE_SOCKET(brdev, cbdev); */
return (ENOENT);
}
@@ -269,6 +269,7 @@ cardbus_driver_added(device_t cbdev, driver_t *driver)
}
if (i > 0 && i == numdevs)
POWER_ENABLE_SOCKET(device_get_parent(cbdev), cbdev);
+ /* XXX Should I wait for power to become good? */
for (i = 0; i < numdevs; i++) {
dev = devlist[i];
if (device_get_state(dev) != DS_NOTPRESENT)
OpenPOWER on IntegriCloud