From 5602b5091c31ba1a8aab08b8a7328a9055929517 Mon Sep 17 00:00:00 2001 From: Nick Hibma Date: Fri, 22 Jan 1999 00:44:31 +0000 Subject: [PATCH] Fixed bug in disconnect handling in uhub.c --- sys/dev/usb/usb_port.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index d7bd4f0040d..26d90128ef7 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -183,8 +183,8 @@ __CONCAT(dname,_attach)(device_t self) #define USB_ATTACH_SUCCESS_RETURN return 0 #define USB_ATTACH_SETUP \ - usbd_device_set_desc(self, devinfo); \ - sc->sc_dev = self + sc->sc_dev = self; \ + usbd_device_set_desc(self, devinfo) #define USB_GET_SC_OPEN(dname, unit, sc) \ struct __CONCAT(dname,_softc) *sc = \ @@ -196,8 +196,9 @@ __CONCAT(dname,_attach)(device_t self) struct __CONCAT(dname,_softc) *sc = \ devclass_get_softc(__CONCAT(dname,_devclass), unit) -#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \ - (device_probe_and_attach((bdev)) == 0 ? ((dev)->softc = (bdev)) : 0) +#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \ + (device_probe_and_attach((bdev)) == 0 ? \ + ((dev)->softc = device_get_softc(bdev)) : 0) /* conversion from one type of queue to the other */ #define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD_UNTIL