Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 216c7a0f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/via-cleanup 

Conflicts:
	sound/pci/hda/patch_via.c
parents ada509ec e905a83a

sound/firewire/isight.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle, 
		isight->packet_index = -1;

		return;

	}

	fw_iso_context_queue_flush(isight->context);



	if (++index >= QUEUE_LENGTH)

		index = 0;

sound/pci/hda/hda_beep.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) 
{

	return 0;

}

void snd_hda_detach_beep_device(struct hda_codec *codec)

static inline void snd_hda_detach_beep_device(struct hda_codec *codec)

{

}

#endif

sound/pci/hda/patch_realtek.c

+0 −2
Original line number Diff line number Diff line
@@ -4884,7 +4884,6 @@ static const struct snd_pci_quirk alc880_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_3ST_DIG),

	SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_3ST),

	SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_6ST_DIG),

	SND_PCI_QUIRK(0x103c, 0x2a09, "HP", ALC880_5ST),

	SND_PCI_QUIRK(0x1043, 0x10b3, "ASUS W1V", ALC880_ASUS_W1V),

	SND_PCI_QUIRK(0x1043, 0x10c2, "ASUS W6A", ALC880_ASUS_DIG),

	SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS Wxx", ALC880_ASUS_DIG),
@@ -13873,7 +13872,6 @@ static const struct snd_pci_quirk alc268_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),

	SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),

	SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),

	SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),

	{}

};

sound/pci/lola/lola.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip) 
	lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */

}



static int lola_parse_tree(struct lola *chip)

static int __devinit lola_parse_tree(struct lola *chip)

{

	unsigned int val;

	int nid, err;

sound/usb/6fire/firmware.c

+0 −1
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static int usb6fire_fw_ezusb_upload( 
	data = 0x00; /* resume ezusb cpu */

	ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);

	if (ret < 0) {

		release_firmware(fw);

		snd_printk(KERN_ERR PREFIX "unable to upload ezusb "

				"firmware %s: end message.\n", fwname);

		return ret;