aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2007-06-09 06:49:05 +0000
committerWarner Losh <imp@FreeBSD.org>2007-06-09 06:49:05 +0000
commit8d58ce651f31c2ddd013fac42904470a0bb3bfac (patch)
tree97a61105020a32f65b52e20173432939e33befff /sys
parenta5b1cb0cd06670f3aa02dac1b57993f3b9c9b4ae (diff)
downloadsrc-8d58ce651f31c2ddd013fac42904470a0bb3bfac.tar.gz
src-8d58ce651f31c2ddd013fac42904470a0bb3bfac.zip
Expand USB_ATTACH_SETUP inline + devinfo tweaks
# looks like there's a chance that uaudio might compile on otherBSD, so leave # those #defines alone as well as make this change in a compatible way.
Notes
Notes: svn path=/head/; revision=170455
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sound/usb/uaudio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index d3317632fccd..8b8e7d2f532f 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -523,13 +523,14 @@ USB_ATTACH(uaudio)
USB_ATTACH_START(uaudio, sc, uaa);
usb_interface_descriptor_t *id;
usb_config_descriptor_t *cdesc;
+#if !define(__FreeBSD__)
char devinfo[1024];
+#endif
usbd_status err;
int i, j, found;
#if defined(__FreeBSD__)
- usbd_devinfo(uaa->device, 0, devinfo);
- USB_ATTACH_SETUP;
+ sc->sc_dev = self;
#else
usbd_devinfo(uaa->device, 0, devinfo, sizeof(devinfo));
printf(": %s\n", devinfo);