Merge tag 'sound-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Here are a chunk of small fixes since rc1: two PCM core fixes, one is
  a long-standing annoyance about lockdep and another is an ARM64 mmap
  fix.

  The rest are a HD-audio HDMI hotplug notification fix, a fix for
  missing NULL termination in Realtek codec quirks and a few new
  device/codec-specific quirks as usual"

* tag 'sound-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add missing terminating entry to SND_HDA_PIN_QUIRK macro
  ALSA: pcm: Fix false lockdep warnings
  ALSA: hda - Fix inverted LED gpio setup for Lenovo Ideapad
  ALSA: hda - hdmi: Fix missing ELD change event on plug/unplug
  ALSA: usb-audio: Add support for Steinberg UR22 USB interface
  ALSA: ALC283 codec - Avoid pop noise on headphones during suspend/resume
  ALSA: pcm: use the same dma mmap codepath both for arm and arm64

1 files changed, 9 insertions, 6 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 39862e98551c..9dc9cf8c90e9 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1583,19 +1583,22 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
                 }
         }
 
-        if (pin_eld->eld_valid && !eld->eld_valid) {
-                update_eld = true;
+        if (pin_eld->eld_valid != eld->eld_valid)
                 eld_changed = true;
-        }
+
+        if (pin_eld->eld_valid && !eld->eld_valid)
+                update_eld = true;
+
         if (update_eld) {
                 bool old_eld_valid = pin_eld->eld_valid;
                 pin_eld->eld_valid = eld->eld_valid;
-                eld_changed = pin_eld->eld_size != eld->eld_size ||
+                if (pin_eld->eld_size != eld->eld_size ||
                               memcmp(pin_eld->eld_buffer, eld->eld_buffer,
-                                     eld->eld_size) != 0;
-                if (eld_changed)
+                                     eld->eld_size) != 0) {
                         memcpy(pin_eld->eld_buffer, eld->eld_buffer,
                                eld->eld_size);
+                        eld_changed = true;
+                }
                 pin_eld->eld_size = eld->eld_size;
                 pin_eld->info = eld->info;