Commit 306f47bd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 8f95c102 e8c0ee5d

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 */