From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 8 Oct 2013 07:30:04 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d820306cbe56fb010f500ae58f9725f49812d39a;p=linux-beck.git

Merge branch 'for-linus' into for-next

For updating the HDMI chmap fix.

Conflicts:
	sound/pci/hda/patch_hdmi.c
---

d820306cbe56fb010f500ae58f9725f49812d39a
diff --cc sound/pci/hda/patch_hdmi.c
index 00e041333904,50173d412ac5..b899eba6f279
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@@ -983,12 -952,9 +991,9 @@@ static void hdmi_setup_audio_infoframe(
  	if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes,
  					sizeof(ai))) {
  		snd_printdd("hdmi_setup_audio_infoframe: "
 -			    "pin=%d channels=%d\n",
 +			    "pin=%d channels=%d ca=0x%02x\n",
  			    pin_nid,
 -			    channels);
 +			    active_channels, ca);
- 		hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
- 					   channels, per_pin->chmap,
- 					   per_pin->chmap_set);
  		hdmi_stop_infoframe_trans(codec, pin_nid);
  		hdmi_fill_audio_infoframe(codec, pin_nid,
  					    ai.bytes, sizeof(ai));