From: Dom Cobley <popcornmix@gmail.com>
Date: Mon, 19 Apr 2021 09:59:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y
X-Git-Tag: submit/tizen/20220208.074352~1086
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=108dfbd3ebc3bee7e6bbfccecc23ffde5899c63f;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y
---

108dfbd3ebc3bee7e6bbfccecc23ffde5899c63f
diff --cc sound/usb/quirks.c
index dab95d0,5ab2a45..3f9ecc7
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@@ -1526,7 -1521,7 +1526,8 @@@ bool snd_usb_get_sample_rate_quirk(stru
  	case USB_ID(0x21b4, 0x0081): /* AudioQuest DragonFly */
  	case USB_ID(0x2912, 0x30c8): /* Audioengine D1 */
  	case USB_ID(0x413c, 0xa506): /* Dell AE515 sound bar */
+ 	case USB_ID(0x046d, 0x084c): /* Logitech ConferenceCam Connect */
 +	case USB_ID(0x09da, 0x2695): /* A4Tech FHD 1080p webcam */
  		return true;
  	}