diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-08-02 10:04:48 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-08-02 10:04:48 +0300 |
commit | 01099b1ad9101ca3f41071a87b9c496d9ea1d2ad (patch) | |
tree | 0fe7a9b87fd8dea482089c49ce65c4b5b4a9a135 /sound/usb/clock.c | |
parent | 825a52482a616d74bd2f5eacc0f8946d025499a7 (diff) | |
parent | eda80d7c9c4db0f55f130e38c682e19b58d5add7 (diff) | |
download | linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.tar.xz |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/clock.c')
-rw-r--r-- | sound/usb/clock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 52de52288e10..14456f61539e 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -324,6 +324,12 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, sources[ret - 1], visited, validate); if (ret > 0) { + /* + * For Samsung USBC Headset (AKG), setting clock selector again + * will result in incorrect default clock setting problems + */ + if (chip->usb_id == USB_ID(0x04e8, 0xa051)) + return ret; err = uac_clock_selector_set_val(chip, entity_id, cur); if (err < 0) return err; |