Commit 87bd8c2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "All device-specific small fixes and quirks mostly for usual suspects,
  USB-audio and HD-audio"

* tag 'sound-fix-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
  ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
  ALSA: hda/realtek - Fix unused variable warning
  ALSA: hda - reverse the setting value in the micmute_led_set
  ALSA: echoaduio: Drop superfluous volatile modifier
  ALSA: usb-audio: Disable Lenovo P620 Rear line-in volume control
  ALSA: usb-audio: add quirk for Pioneer DDJ-RB
  ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109
  ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO
  ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
  ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
  ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support
  ALSA: usb-audio: fix spelling mistake "buss" -> "bus"
parents 5848dc5b 5a25de6d

sound/pci/echoaudio/echoaudio.c

+1 −4
Original line number Diff line number Diff line
@@ -1950,8 +1950,7 @@ static int snd_echo_create(struct snd_card *card, 
		snd_echo_free(chip);

		return -EBUSY;

	}

	chip->dsp_registers = (volatile u32 __iomem *)

		ioremap(chip->dsp_registers_phys, sz);

	chip->dsp_registers = ioremap(chip->dsp_registers_phys, sz);

	if (!chip->dsp_registers) {

		dev_err(chip->card->dev, "ioremap failed\n");

		snd_echo_free(chip);
@@ -2213,7 +2212,6 @@ static int snd_echo_resume(struct device *dev) 
	if (err < 0) {

		kfree(commpage_bak);

		dev_err(dev, "resume init_hw err=%d\n", err);

		snd_echo_free(chip);

		return err;

	}
@@ -2240,7 +2238,6 @@ static int snd_echo_resume(struct device *dev) 
	if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,

			KBUILD_MODNAME, chip)) {

		dev_err(chip->card->dev, "cannot grab irq\n");

		snd_echo_free(chip);

		return -EBUSY;

	}

	chip->irq = pci->irq;

sound/pci/echoaudio/echoaudio.h

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ struct echoaudio { 
	short asic_code;		/* Current ASIC code */

	u32 comm_page_phys;			/* Physical address of the

						 * memory seen by DSP */

	volatile u32 __iomem *dsp_registers;	/* DSP's register base */

	u32 __iomem *dsp_registers;		/* DSP's register base */

	u32 active_mask;			/* Chs. active mask or

						 * punks out */

#ifdef CONFIG_PM_SLEEP

sound/pci/hda/patch_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -1863,6 +1863,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) 
}



static const struct snd_pci_quirk force_connect_list[] = {

	SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),

	SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),

	{}

};

sound/pci/hda/patch_realtek.c

+12 −5
Original line number Diff line number Diff line
@@ -4125,7 +4125,7 @@ static int micmute_led_set(struct led_classdev *led_cdev, 
	struct alc_spec *spec = codec->spec;



	alc_update_gpio_led(codec, spec->gpio_mic_led_mask,

			    spec->micmute_led_polarity, !!brightness);

			    spec->micmute_led_polarity, !brightness);

	return 0;

}
@@ -4160,10 +4160,6 @@ static void alc269_fixup_hp_gpio_led(struct hda_codec *codec, 
static void alc285_fixup_hp_gpio_led(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	spec->micmute_led_polarity = 1;



	alc_fixup_hp_gpio_led(codec, action, 0x04, 0x01);

}
@@ -6159,6 +6155,7 @@ enum { 
	ALC269_FIXUP_CZC_L101,

	ALC269_FIXUP_LEMOTE_A1802,

	ALC269_FIXUP_LEMOTE_A190X,

	ALC256_FIXUP_INTEL_NUC8_RUGGED,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -7480,6 +7477,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		},

		.chain_id = ALC269_FIXUP_DMIC,

	},

	[ALC256_FIXUP_INTEL_NUC8_RUGGED] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x1b, 0x01a1913c }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7777,6 +7783,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),

	SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),

	SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),

	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),



#if 0

	/* Below is a quirk table taken from the old code.

sound/usb/card.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ struct snd_usb_substream { 
	unsigned int tx_length_quirk:1;	/* add length specifier to transfers */

	unsigned int fmt_type;		/* USB audio format type (1-3) */

	unsigned int pkt_offset_adj;	/* Bytes to drop from beginning of packets (for non-compliant devices) */

	unsigned int stream_offset_adj;	/* Bytes to drop from beginning of stream (for non-compliant devices) */



	unsigned int running: 1;	/* running status */

CRA Git | Maintained and supported by SUSTech CRA and CCSE