Module Name: src
Committed By: jakllsch
Date: Tue Dec 13 21:25:10 UTC 2022
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
ehci_device_isoc_init() returns errno not usbd_error; remove blank line
in ehci_device_fs_isoc_init() to match ehci_device_isoc_init()
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.313 src/sys/dev/usb/ehci.c:1.314
--- src/sys/dev/usb/ehci.c:1.313 Tue Dec 13 21:13:16 2022
+++ src/sys/dev/usb/ehci.c Tue Dec 13 21:25:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.313 2022/12/13 21:13:16 jakllsch Exp $ */
+/* $NetBSD: ehci.c,v 1.314 2022/12/13 21:25:10 jakllsch Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.313 2022/12/13 21:13:16 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.314 2022/12/13 21:25:10 jakllsch Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -4259,7 +4259,6 @@ ehci_device_fs_isoc_init(struct usbd_xfe
if (i > 16 || i == 0) {
/* Spec page 271 says intervals > 16 are invalid */
DPRINTF("bInterval %jd invalid", i, 0, 0, 0);
-
return EINVAL;
}
@@ -4620,7 +4619,7 @@ ehci_device_isoc_init(struct usbd_xfer *
if (i > 16 || i == 0) {
/* Spec page 271 says intervals > 16 are invalid */
DPRINTF("bInterval %jd invalid", i, 0, 0, 0);
- return USBD_INVAL;
+ return EINVAL;
}
ufrperframe = uimax(1, USB_UFRAMES_PER_FRAME / (1 << (i - 1)));
