Merge branch 'for-linus' into for-next

tiwai · tiwai · commit 089a60acbd1b · 2025-07-22T20:02:20.000+02:00
Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git a/sound/hda/codecs/realtek/alc269.c b/sound/hda/codecs/realtek/alc269.c
@@ -1545,7 +1545,7 @@ static void alc245_fixup_hp_mute_led_v1_coefbit(struct hda_codec *codec,
 	if (action == HDA_FIXUP_ACT_PRE_PROBE) {
 		spec->mute_led_polarity = 0;
 		spec->mute_led_coef.idx = 0x0b;
-		spec->mute_led_coef.mask = 1 << 3;
+		spec->mute_led_coef.mask = 3 << 2;
 		spec->mute_led_coef.on = 1 << 3;
 		spec->mute_led_coef.off = 0;
 		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c
@@ -825,8 +825,8 @@ static int uaudio_sideband_notifier(struct usb_interface *intf,
 		}
 	}
 
-	mutex_unlock(&qdev_mutex);
 	mutex_unlock(&chip->mutex);
+	mutex_unlock(&qdev_mutex);
 
 	return 0;
 }
@@ -1865,8 +1865,8 @@ static void qc_usb_audio_offload_disconnect(struct snd_usb_audio *chip)
 
 	/* Device has already been cleaned up, or never populated */
 	if (!dev->chip) {
-		mutex_unlock(&qdev_mutex);
 		mutex_unlock(&chip->mutex);
+		mutex_unlock(&qdev_mutex);
 		return;
 	}
 
@@ -1921,8 +1921,8 @@ static void qc_usb_audio_offload_suspend(struct usb_interface *intf,
 
 	uaudio_send_disconnect_ind(chip);
 
-	mutex_unlock(&qdev_mutex);
 	mutex_unlock(&chip->mutex);
+	mutex_unlock(&qdev_mutex);
 }
 
 static struct snd_usb_platform_ops offload_ops = {

Original file line number	Diff line number	Diff line change
`@@ -825,8 +825,8 @@ static int uaudio_sideband_notifier(struct usb_interface *intf,`
`825`	`825`	`}`
`826`	`826`	`}`
`827`	`827`
`828`		`- mutex_unlock(&qdev_mutex);`
`829`	`828`	`mutex_unlock(&chip->mutex);`
	`829`	`+ mutex_unlock(&qdev_mutex);`
`830`	`830`
`831`	`831`	`return 0;`
`832`	`832`	`}`
`@@ -1865,8 +1865,8 @@ static void qc_usb_audio_offload_disconnect(struct snd_usb_audio *chip)`
`1865`	`1865`
`1866`	`1866`	`/* Device has already been cleaned up, or never populated */`
`1867`	`1867`	`if (!dev->chip) {`
`1868`		`- mutex_unlock(&qdev_mutex);`
`1869`	`1868`	`mutex_unlock(&chip->mutex);`
	`1869`	`+ mutex_unlock(&qdev_mutex);`
`1870`	`1870`	`return;`
`1871`	`1871`	`}`
`1872`	`1872`
`@@ -1921,8 +1921,8 @@ static void qc_usb_audio_offload_suspend(struct usb_interface *intf,`
`1921`	`1921`
`1922`	`1922`	`uaudio_send_disconnect_ind(chip);`
`1923`	`1923`
`1924`		`- mutex_unlock(&qdev_mutex);`
`1925`	`1924`	`mutex_unlock(&chip->mutex);`
	`1925`	`+ mutex_unlock(&qdev_mutex);`
`1926`	`1926`	`}`
`1927`	`1927`
`1928`	`1928`	`static struct snd_usb_platform_ops offload_ops = {`