--- src/sys/dev/sound/usb/uaudio.c.orig	Sat Jan 27 03:06:17 2007
+++ src/sys/dev/sound/usb/uaudio.c	Thu Feb  1 16:51:16 2007
@@ -2698,7 +2698,7 @@
 	DPRINTFN(2,("uaudio_get: type=0x%02x req=0x%02x wValue=0x%04x "
 		    "wIndex=0x%04x len=%d\n",
 		    type, which, wValue, wIndex, len));
-	err = usbd_do_request(sc->sc_udev, &req, data);
+	err = usbd_do_request_async(sc->sc_udev, &req, data);
 	if (err) {
 		DPRINTF(("uaudio_get: err=%s\n", usbd_errstr(err)));
 		return -1;
@@ -2753,7 +2753,7 @@
 	DPRINTFN(2,("uaudio_set: type=0x%02x req=0x%02x wValue=0x%04x "
 		    "wIndex=0x%04x len=%d, val=%d\n",
 		    type, which, wValue, wIndex, len, val & 0xffff));
-	err = usbd_do_request(sc->sc_udev, &req, data);
+	err = usbd_do_request_async(sc->sc_udev, &req, data);
 #ifdef USB_DEBUG
 	if (err)
 		DPRINTF(("uaudio_set: err=%d\n", err));
@@ -3011,6 +3011,9 @@
 {
 	struct as_info *as;
 	int endpt;
+#if defined(__FreeBSD__)
+	int locked;
+#endif
 	usbd_status err;
 
 #if defined(__FreeBSD__)
@@ -3023,8 +3026,17 @@
 	DPRINTF(("uaudio_chan_open: endpt=0x%02x, speed=%d, alt=%d\n",
 		 endpt, ch->sample_rate, as->alt));
 
+#if defined(__FreeBSD__)
+	locked = (ch->pcm_ch != NULL && mtx_owned(ch->pcm_ch->lock)) ? 1 : 0;
+	if (locked)
+		CHN_UNLOCK(ch->pcm_ch);
+#endif
 	/* Set alternate interface corresponding to the mode. */
 	err = usbd_set_interface(as->ifaceh, as->alt);
+#if defined(__FreeBSD__)
+	if (locked)
+		CHN_LOCK(ch->pcm_ch);
+#endif
 	if (err)
 		return err;
 
@@ -3059,14 +3071,20 @@
 uaudio_chan_close(struct uaudio_softc *sc, struct chan *ch)
 {
 	struct as_info *as;
-
 #if defined(__FreeBSD__)
+	int locked;
+
 	if (sc->sc_dying)
 		return ;
 #endif
 
 	as = &sc->sc_alts[ch->altidx];
 	as->sc_busy = 0;
+#if defined(__FreeBSD__)
+	locked = (ch->pcm_ch != NULL && mtx_owned(ch->pcm_ch->lock)) ? 1 : 0;
+	if (locked)
+		CHN_UNLOCK(ch->pcm_ch);
+#endif
 	if (sc->sc_nullalt >= 0) {
 		DPRINTF(("uaudio_chan_close: set null alt=%d\n",
 			 sc->sc_nullalt));
@@ -3080,6 +3098,10 @@
 		usbd_abort_pipe(ch->sync_pipe);
 		usbd_close_pipe(ch->sync_pipe);
 	}
+#if defined(__FreeBSD__)
+	if (locked)
+		CHN_LOCK(ch->pcm_ch);
+#endif
 }
 
 static usbd_status
@@ -3737,7 +3759,7 @@
 	data[1] = speed >> 8;
 	data[2] = speed >> 16;
 
-	return usbd_do_request(sc->sc_udev, &req, data);
+	return usbd_do_request_async(sc->sc_udev, &req, data);
 }
 
 
--- src/sys/dev/sound/usb/uaudio_pcm.c.orig	Sat Jan 27 03:14:41 2007
+++ src/sys/dev/sound/usb/uaudio_pcm.c	Thu Feb  1 16:51:16 2007
@@ -144,27 +144,48 @@
 }
 
 static int
-ua_chan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
+ua_chan_setfragments(kobj_t obj, void *data, u_int32_t blksz, u_int32_t blkcnt)
 {
 	device_t pa_dev;
 	struct ua_chinfo *ch = data;
 	struct ua_info *ua = ch->parent;
-	u_int32_t blkcnt;
 
-	RANGE(blocksize, 128, ua->bufsz / 2);
-	blkcnt = ua->bufsz / blocksize;
+	RANGE(blksz, 128, sndbuf_getmaxsize(ch->buffer) / 2);
+	RANGE(blkcnt, 2, 512);
 
-	if ((sndbuf_getblksz(ch->buffer) != blocksize ||
+	while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) {
+		if ((blkcnt >> 1) >= 2)
+			blkcnt >>= 1;
+		else if ((blksz >> 1) >= 128)
+			blksz >>= 1;
+		else
+			break;
+	}
+
+	if ((sndbuf_getblksz(ch->buffer) != blksz ||
 	    sndbuf_getblkcnt(ch->buffer) != blkcnt) &&
-	    sndbuf_resize(ch->buffer, blkcnt, blocksize) != 0)
+	    sndbuf_resize(ch->buffer, blkcnt, blksz) != 0)
 		device_printf(ua->sc_dev, "%s: failed blksz=%u blkcnt=%u\n",
-		    __func__, blocksize, blkcnt);
+		    __func__, blksz, blkcnt);
 
 	ch->blksz = sndbuf_getblksz(ch->buffer);
 
 	pa_dev = device_get_parent(ua->sc_dev);
+	uaudio_chan_set_param_pcm_dma_buff(pa_dev, ch->buf,
+	    ch->buf + sndbuf_getsize(ch->buffer), ch->channel, ch->dir);
 	uaudio_chan_set_param_blocksize(pa_dev, ch->blksz, ch->dir);
 
+	return 1;
+}
+
+static int
+ua_chan_setblocksize(kobj_t obj, void *data, u_int32_t blksz)
+{
+	struct ua_chinfo *ch = data;
+
+	ua_chan_setfragments(obj, data, blksz,
+	    sndbuf_getmaxsize(ch->buffer) / blksz);
+
 	return ch->blksz;
 }
 
@@ -228,6 +249,7 @@
 	KOBJMETHOD(channel_setformat,		ua_chan_setformat),
 	KOBJMETHOD(channel_setspeed,		ua_chan_setspeed),
 	KOBJMETHOD(channel_setblocksize,	ua_chan_setblocksize),
+	/* KOBJMETHOD(channel_setfragments,	ua_chan_setfragments), */
 	KOBJMETHOD(channel_trigger,		ua_chan_trigger),
 	KOBJMETHOD(channel_getptr,		ua_chan_getptr),
 	KOBJMETHOD(channel_getcaps,		ua_chan_getcaps),