diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-11-11 12:32:58 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-11-11 12:32:58 +0000 |
| commit | 807c22db474be63b8edef845228493fc2a774601 (patch) | |
| tree | de511705684b9c812450934d5137fa9c5caeaf57 /sys/dev/usb | |
| parent | 3af25a49f80d5eb5db02ca411b555ebd29898486 (diff) | |
from netbsd revisions 1.2 and 1.3
revision 1.2
Alphabetize the supported device list.
revision 1.3
Get rid of an oddly placed assert().
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_axe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 424ded5e4b7..52d161f2d04 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.15 2004/11/11 12:19:12 dlg Exp $ */ +/* $OpenBSD: if_axe.c,v 1.16 2004/11/11 12:32:57 dlg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 @@ -158,13 +158,13 @@ int axedebug = 0; Static const struct axe_type axe_devs[] = { { { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172}, 0 }, { { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_SNAPPORT}, 0 }, + { { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0}, { { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100}, 0 }, { { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M}, 0 }, - { { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120}, 0 }, { { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX}, 0 }, + { { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120}, 0 }, { { USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL}, 0 }, { { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029}, 0 }, - { { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0}, { { 0, 0}, 0 } }; @@ -715,7 +715,6 @@ axe_rx_list_init(struct axe_softc *sc) if (axe_newbuf(sc, c, NULL) == ENOBUFS) return (ENOBUFS); if (c->axe_xfer == NULL) { -assert(sc->axe_udev); c->axe_xfer = usbd_alloc_xfer(sc->axe_udev); if (c->axe_xfer == NULL) return (ENOBUFS); |