Merge tag 'sound-fix-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Two peaks in diffstat are for the audio EQ init of IDT codecs and the
  EMU2004 usb mixer addition, both of which are pretty device-specific,
  so safe to apply.  The rest are a bunch of small fixes, most of them
  are regression fixes"

* tag 'sound-fix-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
  ALSA: hda - load EQ params into IDT codec on HP bNB13 systems
  ASoC: cs42l52: Correct MIC CTL mask
  ASoC: wm8962: Turn on regcache_cache_only before disabling regulator
  ALSA: jack: Unregister input device at disconnection
  ALSA: pcsp: Fix the order of input device unregistration
  ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations
  ASoC: blackfin: Fix missing break
  ALSA: usb-audio: add front jack channel selector for EMU0204
  ALSA: hda - Don't clear the power state at snd_hda_codec_reset()
  ASoC: arizona: Fix typo in name of EQ coefficient controls
  ALSA: hda - Control EAPD for Master volume on Lenovo N100
  ALSA: hda - Don't turn off EAPD for headphone on Lenovo N100
  ALSA: isa: not allocating enough space
  ALSA: snd-aoa: two copy and paste bugs
  ASoC: wm8997: Correct typo in ISRC mux routes
  ALSA: hda - Check keep_eapd_on before inv_eapd
  ALSA: hda - Fix Line Out automute on Realtek multifunction jacks
  ALSA: msnd: Avoid duplicated driver name
  ALSA: compress_core: don't return -EBADFD from poll if paused
  ALSA: hda - hdmi: Fix wrong baseline length in ATI/AMD generated ELD
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index e68792311bb2..08407bed093e 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -763,12 +763,12 @@ static struct channel_map_table map_tables[] = {
         { SNDRV_CHMAP_RC,       RC },
         { SNDRV_CHMAP_FLC,      FLC },
         { SNDRV_CHMAP_FRC,      FRC },
-        { SNDRV_CHMAP_FLH,      FLH },
-        { SNDRV_CHMAP_FRH,      FRH },
+        { SNDRV_CHMAP_TFL,      FLH },
+        { SNDRV_CHMAP_TFR,      FRH },
         { SNDRV_CHMAP_FLW,      FLW },
         { SNDRV_CHMAP_FRW,      FRW },
         { SNDRV_CHMAP_TC,       TC },
-        { SNDRV_CHMAP_FCH,      FCH },
+        { SNDRV_CHMAP_TFC,      FCH },
         {} /* terminator */
 };
 
@@ -1247,6 +1247,9 @@ static int hdmi_pin_hbr_setup(struct hda_codec *codec, hda_nid_t pin_nid,
                 pinctl = snd_hda_codec_read(codec, pin_nid, 0,
                                             AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
 
+                if (pinctl < 0)
+                        return hbr ? -EINVAL : 0;
+
                 new_pinctl = pinctl & ~AC_PINCTL_EPT;
                 if (hbr)
                         new_pinctl |= AC_PINCTL_EPT_HBR;
@@ -3091,7 +3094,7 @@ static int atihdmi_pin_hbr_setup(struct hda_codec *codec, hda_nid_t pin_nid,
         int hbr_ctl, hbr_ctl_new;
 
         hbr_ctl = snd_hda_codec_read(codec, pin_nid, 0, ATI_VERB_GET_HBR_CONTROL, 0);
-        if (hbr_ctl & ATI_HBR_CAPABLE) {
+        if (hbr_ctl >= 0 && (hbr_ctl & ATI_HBR_CAPABLE)) {
                 if (hbr)
                         hbr_ctl_new = hbr_ctl | ATI_HBR_ENABLE;
                 else