diff options
| author | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
| commit | 9b0755de9f1e9517732f96a37f0ef30b8db23811 (patch) | |
| tree | ee9b2a74c07c732ee357d4810494c3b6aecd6e71 /sys/dev/usb/usb_handle_request.c | |
| parent | ab0b6203abac22f7fa981c24cf452d3dab032727 (diff) | |
| download | FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.zip FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.tar.gz | |
Temporarily revert the new-bus locking for 8.0 release. It will be
reintroduced after HEAD is reopened for commits by re@.
Approved by: re (kib), attilio
Diffstat (limited to 'sys/dev/usb/usb_handle_request.c')
| -rw-r--r-- | sys/dev/usb/usb_handle_request.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c index 2bc3eef..a720919 100644 --- a/sys/dev/usb/usb_handle_request.c +++ b/sys/dev/usb/usb_handle_request.c @@ -152,7 +152,7 @@ usb_handle_set_config(struct usb_xfer *xfer, uint8_t conf_no) * attach: */ USB_XFER_UNLOCK(xfer); - newbus_xlock(); + mtx_lock(&Giant); /* XXX */ sx_xlock(udev->default_sx + 1); if (conf_no == USB_UNCONFIG_NO) { @@ -176,8 +176,8 @@ usb_handle_set_config(struct usb_xfer *xfer, uint8_t conf_no) goto done; } done: + mtx_unlock(&Giant); /* XXX */ sx_unlock(udev->default_sx + 1); - newbus_xunlock(); USB_XFER_LOCK(xfer); return (err); } @@ -236,7 +236,7 @@ usb_handle_iface_request(struct usb_xfer *xfer, * attach: */ USB_XFER_UNLOCK(xfer); - newbus_xlock(); + mtx_lock(&Giant); /* XXX */ sx_xlock(udev->default_sx + 1); error = ENXIO; @@ -353,20 +353,20 @@ tr_repeat: goto tr_stalled; } tr_valid: + mtx_unlock(&Giant); sx_unlock(udev->default_sx + 1); - newbus_xunlock(); USB_XFER_LOCK(xfer); return (0); tr_short: + mtx_unlock(&Giant); sx_unlock(udev->default_sx + 1); - newbus_xunlock(); USB_XFER_LOCK(xfer); return (USB_ERR_SHORT_XFER); tr_stalled: + mtx_unlock(&Giant); sx_unlock(udev->default_sx + 1); - newbus_xunlock(); USB_XFER_LOCK(xfer); return (USB_ERR_STALLED); } |
