Index: sys/dev/usb/uvideo.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uvideo.c,v
retrieving revision 1.85
diff -p -u -r1.85 uvideo.c
--- sys/dev/usb/uvideo.c	10 Apr 2023 15:27:51 -0000	1.85
+++ sys/dev/usb/uvideo.c	2 Aug 2025 20:36:19 -0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvideo.c,v 1.85 2023/04/10 15:27:51 mlelstv Exp $	*/
+/*	$NetBSD: uvideo.c,v 1.83 2022/07/01 01:06:51 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.85 2023/04/10 15:27:51 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.83 2022/07/01 01:06:51 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2262,11 +2262,9 @@ static int
 uvideo_start_transfer(void *addr)
 {
 	struct uvideo_stream *vs = addr;
-	int s, err;
+	int err;
 
-	s = splusb();
 	err = uvideo_stream_start_xfer(vs);
-	splx(s);
 
 	return err;
 }
@@ -2275,11 +2273,9 @@ static int
 uvideo_stop_transfer(void *addr)
 {
 	struct uvideo_stream *vs = addr;
-	int err, s;
+	int err;
 
-	s = splusb();
 	err = uvideo_stream_stop_xfer(vs);
-	splx(s);
 
 	return err;
 }
@@ -2294,7 +2290,6 @@ uvideo_get_control_group(void *addr, str
 	usbd_status err;
 	uint8_t control_id, ent_id, data[16];
 	uint16_t len;
-	int s;
 
 	/* request setup */
 	switch (group->group_id) {
@@ -2324,9 +2319,7 @@ uvideo_get_control_group(void *addr, str
 	USETW(req.wIndex, (ent_id << 8) | sc->sc_ifaceno);
 	USETW(req.wLength, len);
 
-	s = splusb();
 	err = usbd_do_request(sc->sc_udev, &req, data);
-	splx(s);
 	if (err != USBD_NORMAL_COMPLETION) {
 		DPRINTF(("uvideo_set_control: error %s (%d)\n",
 			 usbd_errstr(err), err));
@@ -2355,7 +2348,6 @@ uvideo_set_control_group(void *addr, con
 	usbd_status err;
 	uint8_t control_id, ent_id, data[16]; /* long enough for all controls */
 	uint16_t len;
-	int s;
 
 	switch (group->group_id) {
 	case VIDEO_CONTROL_PANTILT_RELATIVE:
@@ -2416,9 +2408,7 @@ uvideo_set_control_group(void *addr, con
 	USETW(req.wIndex, (ent_id << 8) | sc->sc_ifaceno);
 	USETW(req.wLength, len);
 
-	s = splusb();
 	err = usbd_do_request(sc->sc_udev, &req, data);
-	splx(s);
 	if (err != USBD_NORMAL_COMPLETION) {
 		DPRINTF(("uvideo_set_control: error %s (%d)\n",
 			 usbd_errstr(err), err));