diff options
| author |   pirofti <pirofti@openbsd.org> | 2013-11-07 11:50:38 +0000 |
|---|---|---|
| committer | pirofti <pirofti@openbsd.org> | 2013-11-07 11:50:38 +0000 |
| commit | 4f34dc805adb33193b4d274425288b85991018ed (patch) | |
| tree | 67809ed91472095072b6b12fc6d97bd73a81f8c6 | |
| parent | Now that it is safe to disestablish a hook from itself, do not leak the (diff) | |
| download | wireguard-openbsd-4f34dc805adb33193b4d274425288b85991018ed.tar.xz wireguard-openbsd-4f34dc805adb33193b4d274425288b85991018ed.zip | |
Replace sc_dying in favour of usbd_is_dying() and usbd_deactivate().
Okay mpi@
| -rw-r--r-- | sys/dev/usb/uark.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 1cba4f27437..10fb2fdbbe0 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.17 2013/04/15 09:23:01 mglocker Exp $ */ +/* $OpenBSD: uark.c,v 1.18 2013/11/07 11:50:38 pirofti Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -67,8 +67,6 @@ struct uark_softc { u_char sc_msr; u_char sc_lsr; - - u_char sc_dying; }; void uark_get_status(void *, int portno, u_char *lsr, u_char *msr); @@ -138,7 +136,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) if (usbd_set_config_index(sc->sc_udev, UARK_CONFIG_NO, 1) != 0) { printf("%s: could not set configuration no\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } @@ -148,7 +146,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) if (error != 0) { printf("%s: could not get interface handle\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } @@ -160,7 +158,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) if (ed == NULL) { printf("%s: no endpoint descriptor found for %d\n", sc->sc_dev.dv_xname, i); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } @@ -174,7 +172,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) if (uca.bulkin == -1 || uca.bulkout == -1) { printf("%s: missing endpoint\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } @@ -215,7 +213,7 @@ uark_activate(struct device *self, int act) case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); break; } return (rv); |