summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorandvar <andvar@NetBSD.org>2021-11-14 08:32:07 +0000
committerandvar <andvar@NetBSD.org>2021-11-14 08:32:07 +0000
commit73aaf4485e3e0d3024cd413366f16d86a2e43c03 (patch)
tree02bfa7e0aa871db13264eaa473bb034f20834d58 /sys/dev
parentc80254827981d932d6ea702d25dd6bbfda802aa4 (diff)
revert bPreferedVersion rename. It's named like the by spec (from jmcneill).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uvideo.c8
-rw-r--r--sys/dev/usb/uvideoreg.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index acfbe306276..4113c6094fb 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.62 2021/11/13 21:13:41 andvar Exp $ */
+/* $NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.62 2021/11/13 21:13:41 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2049,11 +2049,11 @@ uvideo_set_format(void *addr, struct video_format *format)
UGETDW(probe.dwMaxPayloadTransferSize)));
if (vs->vs_probelen == 34) {
DPRINTFN(15, (" dwClockFrequency=%u bmFramingInfo=0x%02x "
- "bPreferredVersion=%d bMinVersion=%d "
+ "bPreferedVersion=%d bMinVersion=%d "
"bMaxVersion=%d",
UGETDW(probe.dwClockFrequency),
probe.bmFramingInfo,
- probe.bPreferredVersion,
+ probe.bPreferedVersion,
probe.bMinVersion,
probe.bMaxVersion));
}
diff --git a/sys/dev/usb/uvideoreg.h b/sys/dev/usb/uvideoreg.h
index 0facd3f1db1..571442acfe8 100644
--- a/sys/dev/usb/uvideoreg.h
+++ b/sys/dev/usb/uvideoreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideoreg.h,v 1.5 2021/11/13 21:13:41 andvar Exp $ */
+/* $NetBSD: uvideoreg.h,v 1.6 2021/11/14 08:32:07 andvar Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -644,7 +644,7 @@ typedef struct {
uByte bmFramingInfo;
#define UVIDEO_FRAMING_INFO_FID (1<<0)
#define UVIDEO_FRAMING_INFO_EOF (1<<1)
- uByte bPreferredVersion;
+ uByte bPreferedVersion;
uByte bMinVersion;
uByte bMaxVersion;
} UPACKED uvideo_probe_and_commit_data_t;