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

don't use usb_find_desc() which has some "subtype" semantics which 

should not be used outside of device classes defining it
This commit is contained in:
drochner 2007-02-26 13:36:01 +00:00
parent a0afd1c3d9
commit 527f6a72af
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: uirda.c,v 1.22 2006/11/16 01:33:27 christos Exp $ */
/* $NetBSD: uirda.c,v 1.23 2007/02/26 13:36:01 drochner Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.22 2006/11/16 01:33:27 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.23 2007/02/26 13:36:01 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -339,8 +339,14 @@ USB_ATTACH(uirda)
USB_IRDA_DESCRIPTOR_SIZE, &sc->sc_irdadesc);
if (err) {
/* maybe it's embedded in the config desc? */
const void *d = usb_find_desc(sc->sc_udev, UDESC_IRDA,
USBD_SUBTYPE_ANY);
usbd_desc_iter_t iter;
const usb_descriptor_t *d;
usb_desc_iter_init(sc->sc_udev, &iter);
for (;;) {
d = usb_desc_iter_next(&iter);
if (!d || d->bDescriptorType == UDESC_IRDA)
break;
}
if (d == NULL) {
printf("%s: Cannot get IrDA descriptor\n",
USBDEVNAME(sc->sc_dev));