diff options
Diffstat (limited to 'sys/dev/usb/if_wi_usb.c')
| -rw-r--r-- | sys/dev/usb/if_wi_usb.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 32bff94fc6b..1b15af9f675 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.65 2015/06/10 20:50:05 miod Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.66 2015/06/12 15:47:31 mpi Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -271,11 +271,11 @@ wi_usb_match(struct device *parent, void *match, void *aux) { struct usb_attach_arg *uaa = aux; - if (uaa->iface != NULL) + if (uaa->iface == NULL || uaa->configno != 1) return (UMATCH_NONE); return (wi_usb_lookup(uaa->vendor, uaa->product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE); + UMATCH_VENDOR_PRODUCT_CONF_IFACE : UMATCH_NONE); } @@ -290,29 +290,15 @@ wi_usb_attach(struct device *parent, struct device *self, void *aux) struct usb_attach_arg *uaa = aux; /* int s; */ struct usbd_device *dev = uaa->device; - struct usbd_interface *iface; - usbd_status err; + struct usbd_interface *iface = uaa->iface; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; int i; DPRINTFN(5,(" : wi_usb_attach: sc=%p", sc)); - err = usbd_set_config_no(dev, WI_USB_CONFIG_NO, 1); - if (err) { - printf("%s: setting config no failed\n", sc->wi_usb_dev.dv_xname); - return; - } - /* XXX - any tasks? */ - err = usbd_device2interface_handle(dev, WI_USB_IFACE_IDX, &iface); - if (err) { - printf("%s: getting interface handle failed\n", - sc->wi_usb_dev.dv_xname); - return; - } - /* XXX - flags? */ sc->wi_usb_udev = dev; |