diff options
Diffstat (limited to 'sys/dev/usb/uscanner.c')
| -rw-r--r-- | sys/dev/usb/uscanner.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index e521b89..2bfbd7d 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -377,8 +377,7 @@ USB_ATTACH(uscanner) UID_ROOT, GID_OPERATOR, 0644, "%s", device_get_nameunit(sc->sc_dev)); #endif - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,sc->sc_dev); return 0; } @@ -555,7 +554,7 @@ uscannerread(struct cdev *dev, struct uio *uio, int flag) sc->sc_refcnt++; error = uscanner_do_read(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(sc->sc_dev); return (error); } @@ -605,7 +604,7 @@ uscannerwrite(struct cdev *dev, struct uio *uio, int flag) sc->sc_refcnt++; error = uscanner_do_write(sc, uio, flag); if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); + usb_detach_wakeup(sc->sc_dev); return (error); } @@ -653,7 +652,7 @@ USB_DETACH(uscanner) s = splusb(); if (--sc->sc_refcnt >= 0) { /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); + usb_detach_wait(sc->sc_dev); } splx(s); @@ -671,8 +670,7 @@ USB_DETACH(uscanner) destroy_dev(sc->dev); #endif - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); return (0); } |
