2 files changed, 6 insertions, 7 deletions

diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 24e182e3114c..5f4bbfa8a26e 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -3053,6 +3053,9 @@ ohci_device_bulk_start(usbd_xfer_handle xfer)
 
 	splx(s);
 
+	if (sc->sc_bus.use_polling)
+		ohci_waitintr(sc, xfer);
+
 	return (USBD_IN_PROGRESS);
 }
 
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index f7e69f9f40a9..f7b713d09b29 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -2655,21 +2655,17 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	}
 }
 
-/* umass_cam_poll
- *	all requests are handled through umass_cam_action, requests
- *	are never pending. So, nothing to do here.
- */
 Static void
 umass_cam_poll(struct cam_sim *sim)
 {
-#ifdef USB_DEBUG
 	struct umass_softc *sc = (struct umass_softc *) sim->softc;
 
 	DPRINTF(UDMASS_SCSI, ("%s: CAM poll\n",
 		USBDEVNAME(sc->sc_dev)));
-#endif
 
-	/* nop */
+	usbd_set_polling(sc->sc_udev, 1);
+	usbd_dopoll(sc->iface);
+	usbd_set_polling(sc->sc_udev, 0);
 }