aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-04-03 19:46:12 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-04-03 19:46:12 +0000
commit626fc9fe3d995ec8666e92a1d01810f896e34ec1 (patch)
tree55afba560e3d37dfdc20bbbb68db00bf16a00f1d /sys/dev
parent27b31641fb3dd0b0e8c1c4b5da3ca0404277345c (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pccbb/pccbb_pci.c2
-rw-r--r--sys/dev/usb/controller/usb_controller.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index c89e5ad1f451..4fcd7eafb5e4 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -439,7 +439,7 @@ cbb_pci_attach(device_t brdev)
device_printf(brdev, "unable to create event thread.\n");
panic("cbb_create_event_thread");
}
- sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev));
+ sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev), M_WAITOK);
return (0);
err:
if (sc->irq_res)
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index fc31f15edafa..bea3e7770eec 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -115,7 +115,7 @@ usb2_attach(device_t dev)
}
/* delay vfs_mountroot until the bus is explored */
- bus->bus_roothold = root_mount_hold(device_get_nameunit(dev));
+ bus->bus_roothold = root_mount_hold(device_get_nameunit(dev), M_WAITOK);
if (usb2_post_init_called) {
mtx_lock(&Giant);