summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/controller/usb_controller.c
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2009-04-10 04:08:34 +0000
committerthompsa <thompsa@FreeBSD.org>2009-04-10 04:08:34 +0000
commit39714cb212e38a31abbdf01349fcc0211dd6f073 (patch)
tree706f3f29e2642dfa022bcec35abbf79ceff4a024 /sys/dev/usb/controller/usb_controller.c
parent9fcc70de74585cb50ad7e66252ee1d76b7fdce9a (diff)
downloadFreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.zip
FreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.tar.gz
Revert r190676,190677
The geom and CAM changes for root_hold are the wrong solution for USB design quirks. Requested by: scottl
Diffstat (limited to 'sys/dev/usb/controller/usb_controller.c')
-rw-r--r--sys/dev/usb/controller/usb_controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index 77ff430..474cbe5 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -114,7 +114,7 @@ usb2_attach(device_t dev)
}
/* delay vfs_mountroot until the bus is explored */
- bus->bus_roothold = root_mount_hold(device_get_nameunit(dev), M_WAITOK);
+ bus->bus_roothold = root_mount_hold(device_get_nameunit(dev));
if (usb2_post_init_called) {
mtx_lock(&Giant);
OpenPOWER on IntegriCloud