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

Commit 308b892c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 20f4d6c3 cc374c47

sound/pci/hda/hda_hwdep.c

+8 −7
Original line number Diff line number Diff line
@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev, 
{

	struct snd_hwdep *hwdep = dev_get_drvdata(dev);

	struct hda_codec *codec = hwdep->private_data;

	char *p;

	struct hda_verb verb, *v;

	struct hda_verb *v;

	int nid, verb, param;



	verb.nid = simple_strtoul(buf, &p, 0);

	verb.verb = simple_strtoul(p, &p, 0);

	verb.param = simple_strtoul(p, &p, 0);

	if (!verb.nid || !verb.verb || !verb.param)

	if (sscanf(buf, "%i %i %i", &nid, &verb, &param) != 3)

		return -EINVAL;

	if (!nid || !verb)

		return -EINVAL;

	v = snd_array_new(&codec->init_verbs);

	if (!v)

		return -ENOMEM;

	*v = verb;

	v->nid = nid;

	v->verb = verb;

	v->param = param;

	return count;

}

sound/pci/hda/patch_realtek.c

+3 −0
Original line number Diff line number Diff line
@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec) 
		case 0x106b3e00: /* iMac 24 Aluminium */

			board_config = ALC885_IMAC24;

			break;

		case 0x106b00a0: /* MacBookPro3,1 - Another revision */

		case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */

		case 0x106b00a4: /* MacbookPro4,1 */

		case 0x106b2c00: /* Macbook Pro rev3 */
@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 
		ALC888_ACER_ASPIRE_4930G),

	SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",

		ALC888_ACER_ASPIRE_4930G),

	SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",

		ALC888_ACER_ASPIRE_4930G),

	SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */

	SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),

	SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),