Deleted Added
full compact
1c1
< /* $FreeBSD: head/sys/dev/usb/usb_hub.c 246759 2013-02-13 12:35:17Z hselasky $ */
---
> /* $FreeBSD: head/sys/dev/usb/usb_hub.c 250207 2013-05-03 11:10:04Z hselasky $ */
102a103,105
> #if (USB_HAVE_FIXED_PORT != 0)
> struct usb_hub sc_hub;
> #endif
924a928
> uint16_t nports;
926d929
< uint8_t nports;
1069a1073,1077
> if (nports > USB_MAX_PORTS) {
> DPRINTF("Port limit exceeded\n");
> goto error;
> }
> #if (USB_HAVE_FIXED_PORT == 0)
1073c1081
< if (hub == NULL) {
---
> if (hub == NULL)
1075c1083,1085
< }
---
> #else
> hub = &sc->sc_hub;
> #endif
1200,1203c1210,1213
< if (udev->hub) {
< free(udev->hub, M_USBDEV);
< udev->hub = NULL;
< }
---
> #if (USB_HAVE_FIXED_PORT == 0)
> free(udev->hub, M_USBDEV);
> #endif
> udev->hub = NULL;
1242a1253
> #if (USB_HAVE_FIXED_PORT == 0)
1243a1255
> #endif