aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb/ucom.c
diff options
context:
space:
mode:
authorMatthew Dillon <dillon@FreeBSD.org>1999-01-28 01:59:53 +0000
committerMatthew Dillon <dillon@FreeBSD.org>1999-01-28 01:59:53 +0000
commit0a5e03dda5108aa95d11b714c83217c28a147f6e (patch)
tree748e59fc38cfdff420e3cd6c6eb4f4c5af2273e7 /sys/dev/usb/ucom.c
parent972a1bcf5db5ee4c5520a1d29d3c81e81bdec84f (diff)
Notes
Diffstat (limited to 'sys/dev/usb/ucom.c')
-rw-r--r--sys/dev/usb/ucom.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index b0fb1a7cad378..7724ece3e808e 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -96,8 +96,8 @@ USB_MATCH(ucom)
if (!uaa->iface)
return (UMATCH_NONE);
id = usbd_get_interface_descriptor(uaa->iface);
- if (id &&
- id->bInterfaceClass != UCLASS_CDC ||
+ if ((id &&
+ id->bInterfaceClass != UCLASS_CDC) ||
id->bInterfaceSubClass != USUBCLASS_ABSTRACT_CONTROL_MODEL)
return (UMATCH_NONE);
return (UMATCH_IFACECLASS_IFACESUBCLASS);
@@ -124,12 +124,12 @@ USB_ATTACH(ucom)
static int
ucom_detach(device_t self)
{
- char *devinfo = (char *) device_get_desc(self);
+ const char *devinfo = device_get_desc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
- free(devinfo, M_USB);
+ free((void *)devinfo, M_USB);
}
return 0;
}