summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/usb/uaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/usb/uaudio.c')
-rw-r--r--sys/dev/sound/usb/uaudio.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 7b40328..504cc17 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -552,14 +552,14 @@ USB_ATTACH(uaudio)
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
device_get_nameunit(sc->sc_dev));
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
err = uaudio_identify(sc, cdesc);
if (err) {
printf("%s: audio descriptors make no sense, error=%d\n",
device_get_nameunit(sc->sc_dev), err);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
sc->sc_ac_ifaceh = uaa->iface;
@@ -586,7 +586,7 @@ USB_ATTACH(uaudio)
if (sc->sc_alts[j].ifaceh == NULL) {
printf("%s: alt %d missing AS interface(s)\n",
device_get_nameunit(sc->sc_dev), j);
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
}
@@ -620,7 +620,7 @@ USB_ATTACH(uaudio)
sc->sc_dying = 0;
if (audio_attach_mi(sc->sc_dev)) {
printf("audio_attach_mi failed\n");
- USB_ATTACH_ERROR_RETURN;
+ return ENXIO;
}
#endif
@@ -630,8 +630,7 @@ USB_ATTACH(uaudio)
OID_AUTO, "async", CTLFLAG_RW, &sc->async, 0,
"Asynchronous USB request");
#endif
-
- USB_ATTACH_SUCCESS_RETURN;
+ return 0;
}
#if defined(__NetBSD__) || defined(__OpenBSD__)
OpenPOWER on IntegriCloud