Commit 089a60ac authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 0156c22f 931837cd

sound/hda/codecs/realtek/alc269.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/usb/qcom/qc_audio_offload.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {