diff options
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 11 | ||||
| -rw-r--r-- | sys/dev/usb/usbdivar.h | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index e371603f6a9..7662c178a07 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.145 2018/11/20 11:51:23 mpi Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.146 2018/11/27 14:56:09 mpi Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -891,6 +891,7 @@ usbd_probe_and_attach(struct device *parent, struct usbd_device *dev, int port, err = USBD_NOMEM; goto fail; } + dev->nsubdev = 2; dev->subdevs[dev->ndevs++] = dv; dev->subdevs[dev->ndevs] = 0; err = USBD_NORMAL_COMPLETION; @@ -938,6 +939,7 @@ usbd_probe_and_attach(struct device *parent, struct usbd_device *dev, int port, err = USBD_NOMEM; goto fail; } + dev->nsubdev = nifaces + 2; len = (nifaces + 2) * sizeof(dv); for (i = 0; i < nifaces; i++) { @@ -964,8 +966,9 @@ usbd_probe_and_attach(struct device *parent, struct usbd_device *dev, int port, goto fail; } - free(dev->subdevs, M_USB, (nifaces + 2) * sizeof(dv)); + free(dev->subdevs, M_USB, dev->nsubdev * sizeof(*dev->subdevs)); dev->subdevs = NULL; + dev->nsubdev = 0; } /* No interfaces were attached in any of the configurations. */ @@ -989,6 +992,7 @@ generic: err = USBD_NOMEM; goto fail; } + dev->nsubdev = 2; } dev->subdevs[dev->ndevs++] = dv; dev->subdevs[dev->ndevs] = 0; @@ -1407,8 +1411,7 @@ usb_free_device(struct usbd_device *dev) } if (dev->cdesc != NULL) free(dev->cdesc, M_USB, UGETW(dev->cdesc->wTotalLength)); - if (dev->subdevs != NULL) - free(dev->subdevs, M_USB, 0); + free(dev->subdevs, M_USB, dev->nsubdev * sizeof(*dev->subdevs)); dev->bus->devices[dev->address] = NULL; if (dev->vendor != NULL) diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index ee92ce7d6de..6600c402979 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdivar.h,v 1.78 2018/11/20 11:51:23 mpi Exp $ */ +/* $OpenBSD: usbdivar.h,v 1.79 2018/11/27 14:56:09 mpi Exp $ */ /* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */ @@ -158,6 +158,7 @@ struct usbd_device { const struct usbd_quirks *quirks; /* device quirks, always set */ struct usbd_hub *hub; /* only if this is a hub */ struct device **subdevs; /* sub-devices, 0 terminated */ + int nsubdev; /* size of the `subdevs' array */ int ndevs; /* # of subdevs */ char *serial; /* serial number, can be NULL */ |