diff options
author | imp <imp@FreeBSD.org> | 2007-06-09 06:39:43 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2007-06-09 06:39:43 +0000 |
commit | 582ec1f8d6aa61d7dab4bf01ad66365299e8fe6d (patch) | |
tree | af8426b0f5c3233d268a819b768cbaeacd406358 /sys/dev/usb/uark.c | |
parent | 8c690e3fb00ef2d056998dcb256eee8280eaf513 (diff) | |
download | FreeBSD-src-582ec1f8d6aa61d7dab4bf01ad66365299e8fe6d.zip FreeBSD-src-582ec1f8d6aa61d7dab4bf01ad66365299e8fe6d.tar.gz |
Kill devinfo stuff. It is no longer needed.
Kill bogus bzero as necessary.
Minor tidy.
Expand USB_ATTACH_SETUP inline where needed.
Diffstat (limited to 'sys/dev/usb/uark.c')
-rw-r--r-- | sys/dev/usb/uark.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 5aefc9f..fb6ea89 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -131,14 +131,10 @@ USB_ATTACH(uark) usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; - char *devinfo; const char *devname; int i; struct ucom_softc *ucom = &sc->sc_ucom; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - - bzero(ucom, sizeof(struct ucom_softc)); ucom->sc_dev = self; ucom->sc_udev = dev; @@ -162,9 +158,6 @@ USB_ATTACH(uark) } else iface = uaa->iface; - usbd_devinfo(dev, 0, devinfo); - printf("%s: %s\n", devname, devinfo); - id = usbd_get_interface_descriptor(iface); ucom->sc_iface = iface; @@ -197,15 +190,11 @@ USB_ATTACH(uark) DPRINTF(("uark: in=0x%x out=0x%x\n", ucom->sc_bulkin_no, ucom->sc_bulkout_no)); ucom_attach(&sc->sc_ucom); - free(devinfo, M_USBDEV); - USB_ATTACH_SUCCESS_RETURN; bad: DPRINTF(("uftdi_attach: ATTACH ERROR\n")); ucom->sc_dying = 1; - free(devinfo, M_USBDEV); - USB_ATTACH_ERROR_RETURN; } |