diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-05-27 10:24:52 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-05-27 10:24:52 +0000 |
| commit | 7805df2b30f8de1d99751bd0e3a1506c3972904c (patch) | |
| tree | 85d8c2f9ffb78f558de8f247418f78153ba5e98f | |
| parent | c9cdeefaa7d6c21008607a601c76e89b701f3b01 (diff) | |
Some other missed bits.
| -rw-r--r-- | sys/dev/usb/if_cdcef.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usbf.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index 85c912f9537..5eea6ae4091 100644 --- a/sys/dev/usb/if_cdcef.c +++ b/sys/dev/usb/if_cdcef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdcef.c,v 1.13 2007/05/27 04:00:24 jsg Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.14 2007/05/27 10:24:51 jsg Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -448,7 +448,7 @@ done: status = usbf_transfer(xfer); if (status && status != USBF_IN_PROGRESS) { printf("%s: usbf_transfer failed\n", DEVNAME(sc)); - USB_ATTACH_ERROR_RETURN; + return; } } diff --git a/sys/dev/usb/usbf.c b/sys/dev/usb/usbf.c index 195314fc3e1..0c6a2f793f8 100644 --- a/sys/dev/usb/usbf.c +++ b/sys/dev/usb/usbf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbf.c,v 1.3 2007/05/27 04:00:25 jsg Exp $ */ +/* $OpenBSD: usbf.c,v 1.4 2007/05/27 10:24:51 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -136,7 +136,7 @@ usbf_attach(struct device *parent, struct device *self, void *aux) default: printf(", not supported\n"); sc->sc_dying = 1; - USB_ATTACH_ERROR_RETURN; + return; } printf("\n"); @@ -147,7 +147,7 @@ usbf_attach(struct device *parent, struct device *self, void *aux) if (usbf_softintr_establish(sc->sc_bus)) { printf("%s: can't establish softintr\n", DEVNAME(sc)); sc->sc_dying = 1; - USB_ATTACH_ERROR_RETURN; + return; } /* Attach the function driver. */ @@ -156,7 +156,7 @@ usbf_attach(struct device *parent, struct device *self, void *aux) printf("%s: usbf_new_device failed, %s\n", DEVNAME(sc), usbf_errstr(err)); sc->sc_dying = 1; - USB_ATTACH_ERROR_RETURN; + return; } /* Create a process context for asynchronous tasks. */ |