Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more careful when setting the alternate interface.

Browse Source
This commit is contained in:
augustss 2000-05-31 16:15:49 +00:00
parent 18cd73168e
commit ca8d562f6e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/usb_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_subr.c,v 1.76 2000/04/27 15:26:50 augustss Exp $ */ /* $NetBSD: usb_subr.c,v 1.77 2000/05/31 16:15:49 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/* /*
@ -440,15 +440,17 @@ usbd_fill_iface_data(dev, ifaceidx, altidx)
int altidx; int altidx;
{ {
usbd_interface_handle ifc = &dev->ifaces[ifaceidx]; usbd_interface_handle ifc = &dev->ifaces[ifaceidx];
usb_interface_descriptor_t *idesc;
char *p, *end; char *p, *end;
int endpt, nendpt; int endpt, nendpt;
DPRINTFN(4,("usbd_fill_iface_data: ifaceidx=%d altidx=%d\n", DPRINTFN(4,("usbd_fill_iface_data: ifaceidx=%d altidx=%d\n",
ifaceidx, altidx)); ifaceidx, altidx));
ifc->device = dev; idesc = usbd_find_idesc(dev->cdesc, ifaceidx, altidx);
ifc->idesc = usbd_find_idesc(dev->cdesc, ifaceidx, altidx); if (idesc == NULL)
if (ifc->idesc == 0)
return (USBD_INVAL); return (USBD_INVAL);
ifc->device = dev;
ifc->idesc = idesc;
ifc->index = ifaceidx; ifc->index = ifaceidx;
ifc->altindex = altidx; ifc->altindex = altidx;
nendpt = ifc->idesc->bNumEndpoints; nendpt = ifc->idesc->bNumEndpoints;
@ -494,8 +496,10 @@ usbd_fill_iface_data(dev, ifaceidx, altidx)
return (USBD_NORMAL_COMPLETION); return (USBD_NORMAL_COMPLETION);
bad: bad:
if (ifc->endpoints != NULL) if (ifc->endpoints != NULL) {
free(ifc->endpoints, M_USB); free(ifc->endpoints, M_USB);
ifc->endpoints = NULL;
}
return (USBD_INVAL); return (USBD_INVAL);
} }