diff options
Diffstat (limited to 'sys/dev/usb/ulpt.c')
| -rw-r--r-- | sys/dev/usb/ulpt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index da457f59b69..00e6974c84e 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.44 2013/09/20 15:34:51 mpi Exp $ */ +/* $OpenBSD: ulpt.c,v 1.45 2013/11/07 13:11:10 pirofti Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -103,7 +103,6 @@ struct ulpt_softc { u_char sc_laststatus; int sc_refcnt; - u_char sc_dying; struct ulpt_fwdev *sc_fwdev; }; @@ -266,7 +265,7 @@ ulpt_attach(struct device *parent, struct device *self, void *aux) if (err) { printf("%s: setting alternate interface failed\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } } @@ -294,7 +293,7 @@ ulpt_attach(struct device *parent, struct device *self, void *aux) if (sc->sc_out == -1) { printf("%s: could not find bulk out endpoint\n", sc->sc_dev.dv_xname); - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); return; } @@ -365,7 +364,7 @@ ulpt_activate(struct device *self, int act) switch (act) { case DVACT_DEACTIVATE: - sc->sc_dying = 1; + usbd_deactivate(sc->sc_udev); break; } return (0); @@ -482,7 +481,7 @@ ulptopen(dev_t dev, int flag, int mode, struct proc *p) if (sc == NULL) return (ENXIO); - if (sc == NULL || sc->sc_iface == NULL || sc->sc_dying) + if (sc == NULL || sc->sc_iface == NULL || usbd_is_dying(sc->sc_udev)) return (ENXIO); if (sc->sc_state) @@ -497,7 +496,7 @@ ulptopen(dev_t dev, int flag, int mode, struct proc *p) if ((flags & ULPT_NOPRIME) == 0) { ulpt_reset(sc); - if (sc->sc_dying) { + if (usbd_is_dying(sc->sc_udev)) { error = ENXIO; sc->sc_state = 0; goto done; @@ -659,7 +658,7 @@ ulptwrite(dev_t dev, struct uio *uio, int flags) sc = ulpt_cd.cd_devs[ULPTUNIT(dev)]; - if (sc->sc_dying) + if (usbd_is_dying(sc->sc_udev)) return (EIO); sc->sc_refcnt++; |