diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-05-03 11:10:04 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-05-03 11:10:04 +0000 |
| commit | 2c79a775ed2daeee80f5a665e947648f501bf40e (patch) | |
| tree | da34869305f7442f6ba4ce940376c157aa9705e3 /sys/dev/usb/template | |
| parent | 5d0b98f2c3b1859dd31c4481cc2db94c7f2431ef (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/template')
| -rw-r--r-- | sys/dev/usb/template/usb_template.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c index b815161e898e..73ca73b079e3 100644 --- a/sys/dev/usb/template/usb_template.c +++ b/sys/dev/usb/template/usb_template.c @@ -69,6 +69,7 @@ #include <dev/usb/usb_controller.h> #include <dev/usb/usb_bus.h> +#include <dev/usb/usb_request.h> #include <dev/usb/template/usb_template.h> #endif /* USB_GLOBAL_INCLUDE_FILE */ @@ -1267,7 +1268,7 @@ usb_temp_setup(struct usb_device *udev, goto done; } /* allocate zeroed memory */ - uts->buf = malloc(uts->size, M_USB, M_WAITOK | M_ZERO); + uts->buf = usbd_alloc_config_desc(udev, uts->size); /* * Allow malloc() to return NULL regardless of M_WAITOK flag. * This helps when porting the software to non-FreeBSD @@ -1336,12 +1337,8 @@ done: void usb_temp_unsetup(struct usb_device *udev) { - if (udev->usb_template_ptr) { - - free(udev->usb_template_ptr, M_USB); - - udev->usb_template_ptr = NULL; - } + usbd_free_config_desc(udev, udev->usb_template_ptr); + udev->usb_template_ptr = NULL; } static usb_error_t |