intel · lgundapx · Oct 7, 2025
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
@@ -3068,6 +3068,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
 	}
 
 	/* Apply the common HCI quirks for Intel device */
+	set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
 	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
 	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 	set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);

diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
@@ -865,7 +865,8 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
 
 	/* Wait until the previous preallocation is completed */
 	while (!llist_empty(&ref->preallocated_barriers))
-		cond_resched();
+		//cond_resched();
+		usleep_range(10, 50);
 
 	/*
 	 * Preallocate a node for each physical engine supporting the target

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
@@ -2575,6 +2575,15 @@ static const struct usb_device_id uvc_ids[] = {
 	  .bInterfaceSubClass	= 1,
 	  .bInterfaceProtocol	= 0,
 	  .driver_info		= UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)},
+	/* Logitech HD Pro Webcam C922 */
+	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
+				| USB_DEVICE_ID_MATCH_INT_INFO,
+	  .idVendor		= 0x046d,
+	  .idProduct		= 0x085c,
+	  .bInterfaceClass	= USB_CLASS_VIDEO,
+	  .bInterfaceSubClass	= 1,
+	  .bInterfaceProtocol	= 0,
+	  .driver_info		= (kernel_ulong_t)&uvc_quirk_probe_def },
 	/* Logitech, Webcam B910 */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_INT_INFO,

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
@@ -2219,7 +2219,9 @@ void _trace_android_rvh_f2fs_down_read(wait_queue_head_t *read_waiters,
 static inline void f2fs_down_read(struct f2fs_rwsem *sem)
 {
 	bool skip = false;
+#ifdef CONFIG_F2FS_UNFAIR_RWSEM
 	_trace_android_rvh_f2fs_down_read(&sem->read_waiters, &sem->internal_rwsem, &skip);
+#endif
 	if (skip)
 		return;
 #ifdef CONFIG_F2FS_UNFAIR_RWSEM

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
@@ -14,6 +14,7 @@
 #include <linux/poll.h>
 #include <linux/mm.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <linux/pm_qos.h>
 #include <linux/refcount.h>
 #include <linux/uio.h>

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
@@ -177,6 +177,7 @@ config SND_BCD2000
 	  will be called snd-bcd2000.
 
 source "sound/usb/line6/Kconfig"
+source "sound/usb/btusb/Kconfig"
 
 endif	# SND_USB
 
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
@@ -36,3 +36,4 @@ obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
 obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/
 obj-$(CONFIG_SND_USB_LINE6)	+= line6/
+obj-$(CONFIG_BT_SCOHCI)		+= btusb/
diff --git a/sound/usb/btusb/Kconfig b/sound/usb/btusb/Kconfig
@@ -0,0 +1,11 @@
+config BT_SCOHCI
+	tristate "BT HCI USB driver"
+	depends on BT
+	help
+	  Bluetooth SCO USB driver.
+	  This driver is required if you want to use Bluetooth devices with
+	  USB interface to support SCO.
+
+	  Say Y here to compile support for Bluetooth USB devices into the
+	  kernel or say M to compile it as module (btusb)
+
diff --git a/sound/usb/btusb/Makefile b/sound/usb/btusb/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_BT_SCOHCI)          += btusb_sco_snd_card.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o

		obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/
		obj-$(CONFIG_SND_USB_LINE6) += line6/
		obj-$(CONFIG_BT_SCOHCI) += btusb/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		obj-$(CONFIG_BT_SCOHCI) += btusb_sco_snd_card.o