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

Commit 63f4b3a4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-next 

The updates of HD-audio drivers for 3.15
parents 4fa71c15 3d692451

sound/pci/hda/hda_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, 
						    AC_PWRST_D0);

		}

		if (enable && path->multi[i])

			snd_hda_codec_write_cache(codec, nid, 0,

			snd_hda_codec_update_cache(codec, nid, 0,

					    AC_VERB_SET_CONNECT_SEL,

					    path->idx[i]);

		if (has_amp_in(codec, path, i))

sound/pci/hda/hda_intel.c

+9 −14
Original line number Diff line number Diff line
@@ -834,18 +834,6 @@ static unsigned int azx_command_addr(u32 cmd) 
	return addr;

}



static unsigned int azx_response_addr(u32 res)

{

	unsigned int addr = res & 0xf;



	if (addr >= AZX_MAX_CODECS) {

		snd_BUG();

		addr = 0;

	}



	return addr;

}



/* send a command */

static int azx_corb_send_cmd(struct hda_bus *bus, u32 val)

{
@@ -907,8 +895,15 @@ static void azx_update_rirb(struct azx *chip) 
		rp = chip->rirb.rp << 1; /* an RIRB entry is 8-bytes */

		res_ex = le32_to_cpu(chip->rirb.buf[rp + 1]);

		res = le32_to_cpu(chip->rirb.buf[rp]);

		addr = azx_response_addr(res_ex);

		if (res_ex & ICH6_RIRB_EX_UNSOL_EV)

		addr = res_ex & 0xf;

		if ((addr >= AZX_MAX_CODECS) || !(chip->codec_mask & (1 << addr))) {

			snd_printk(KERN_ERR SFX "%s: spurious response %#x:%#x, rp = %d, wp = %d",

				   pci_name(chip->pci),

				   res, res_ex,

				   chip->rirb.rp, wp);

			snd_BUG();

		}

		else if (res_ex & ICH6_RIRB_EX_UNSOL_EV)

			snd_hda_queue_unsol_event(chip->bus, res, res_ex);

		else if (chip->rirb.cmds[addr]) {

			chip->rirb.res[addr] = res;