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

Commit 6cec5083 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add missing COEF initialization for ALC887
  ALSA: hda - Add missing initialization for ALC272
  sound: usb-audio: handle wMaxPacketSize for FIXED_ENDPOINT devices
  ALSA: hda - Fix misc workqueue issues
  ALSA: hda - Add quirk for FSC Amilo Xi2550
parents 5e3bd4e4 b0050cae

sound/pci/hda/hda_codec.c

+5 −4
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, 
{

	struct hda_bus *bus;

	int err;

	char qname[8];

	static struct snd_device_ops dev_ops = {

		.dev_register = snd_hda_bus_dev_register,

		.dev_free = snd_hda_bus_dev_free,
@@ -517,10 +516,12 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, 
	mutex_init(&bus->cmd_mutex);

	INIT_LIST_HEAD(&bus->codec_list);



	snprintf(qname, sizeof(qname), "hda%d", card->number);

	bus->workq = create_workqueue(qname);

	snprintf(bus->workq_name, sizeof(bus->workq_name),

		 "hd-audio%d", card->number);

	bus->workq = create_singlethread_workqueue(bus->workq_name);

	if (!bus->workq) {

		snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);

		snd_printk(KERN_ERR "cannot create workqueue %s\n",

			   bus->workq_name);

		kfree(bus);

		return -ENOMEM;

	}

sound/pci/hda/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ struct hda_bus { 


	/* unsolicited event queue */

	struct hda_bus_unsolicited *unsol;

	char workq_name[16];

	struct workqueue_struct *workq;	/* common workqueue for codecs */



	/* assigned PCMs */

sound/pci/hda/patch_realtek.c

+4 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,7 @@ do_sku: 
		case 0x10ec0267:

		case 0x10ec0268:

		case 0x10ec0269:

		case 0x10ec0272:

		case 0x10ec0660:

		case 0x10ec0662:

		case 0x10ec0663:
@@ -1065,6 +1066,7 @@ do_sku: 
		case 0x10ec0882:

		case 0x10ec0883:

		case 0x10ec0885:

		case 0x10ec0887:

		case 0x10ec0889:

			snd_hda_codec_write(codec, 0x20, 0,

					    AC_VERB_SET_COEF_INDEX, 7);
@@ -8515,6 +8517,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),

	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),

	SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550",

		      ALC883_FUJITSU_PI2515),

	SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),

	SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530",

		ALC888_FUJITSU_XA3530),

sound/usb/usbaudio.c

+1 −0
Original line number Diff line number Diff line
@@ -2966,6 +2966,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, 
		return -EINVAL;

	}

	alts = &iface->altsetting[fp->altset_idx];

	fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);

	usb_set_interface(chip->dev, fp->iface, 0);

	init_usb_pitch(chip->dev, fp->iface, alts, fp);

	init_usb_sample_rate(chip->dev, fp->iface, alts, fp, fp->rate_max);