diff --git a/.github/workflows/build-check_aarch64.yml b/.github/workflows/build-check_aarch64.yml
index f1e640115603..9bcb0587db44 100644
--- a/.github/workflows/build-check_aarch64.yml
+++ b/.github/workflows/build-check_aarch64.yml
@@ -1,6 +1,6 @@
 name: aarch64 CI
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - '**'
       - '!mainline'
diff --git a/.github/workflows/build-check_x86_64.yml b/.github/workflows/build-check_x86_64.yml
index 97f9fc567dc1..2bf53a9f70f6 100644
--- a/.github/workflows/build-check_x86_64.yml
+++ b/.github/workflows/build-check_x86_64.yml
@@ -1,6 +1,6 @@
 name: x86_64 CI
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - '**'
       - '!mainline'
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index d509a4a2f08e..50b7ca55fbab 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -672,7 +672,7 @@ static int uvc_parse_format(struct uvc_device *dev,
 	 * Parse the frame descriptors. Only uncompressed, MJPEG and frame
 	 * based formats have frame descriptors.
 	 */
-	while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
+	while (ftype && buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
 	       buffer[2] == ftype) {
 		frame = &format->frame[format->nframes];
 		if (ftype != UVC_VS_FRAME_FRAME_BASED)