Module Name: src
Committed By: jakllsch
Date: Tue May 19 18:32:35 UTC 2020
Modified Files:
src/sys/dev/usb: usbdi.c
Log Message:
Use usbd_destroy_xfer() in usbd_request_async() instead of usbd_free_xfer().
The only user of usbd_request_async() & co. does a usbd_create_xfer(), so use
the correct deconstructor.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/dev/usb/usbdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.201 src/sys/dev/usb/usbdi.c:1.202
--- src/sys/dev/usb/usbdi.c:1.201 Fri May 15 06:15:42 2020
+++ src/sys/dev/usb/usbdi.c Tue May 19 18:32:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.201 2020/05/15 06:15:42 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.202 2020/05/19 18:32:35 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.201 2020/05/15 06:15:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.202 2020/05/19 18:32:35 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1243,7 +1243,7 @@ usbd_do_request_len(struct usbd_device *
static void
usbd_request_async_cb(struct usbd_xfer *xfer, void *priv, usbd_status status)
{
- usbd_free_xfer(xfer);
+ usbd_destroy_xfer(xfer);
}
/*
@@ -1264,7 +1264,7 @@ usbd_request_async(struct usbd_device *d
callback);
err = usbd_transfer(xfer);
if (err != USBD_IN_PROGRESS) {
- usbd_free_xfer(xfer);
+ usbd_destroy_xfer(xfer);
return (err);
}
return (USBD_NORMAL_COMPLETION);
