Module Name: src
Committed By: skrll
Date: Fri Dec 31 12:00:18 UTC 2021
Modified Files:
src/sys/dev/usb: usbdi.c
Log Message:
usbd_do_request_len (and friends) return usbd_status so return one in
the usbd_create_xfer failure case. Spotted by Riastradh.
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 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.220 src/sys/dev/usb/usbdi.c:1.221
--- src/sys/dev/usb/usbdi.c:1.220 Tue Dec 21 09:51:22 2021
+++ src/sys/dev/usb/usbdi.c Fri Dec 31 12:00:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.220 2021/12/21 09:51:22 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.221 2021/12/31 12:00:18 skrll 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.220 2021/12/21 09:51:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.221 2021/12/31 12:00:18 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1243,7 +1243,7 @@ usbd_do_request_len(struct usbd_device *
int error = usbd_create_xfer(dev->ud_pipe0, len, 0, 0, &xfer);
if (error)
- return error;
+ return USBD_NOMEM;
usbd_setup_default_xfer(xfer, dev, 0, timeout, req, data,
UGETW(req->wLength), flags, NULL);
