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

Pull sound fixes from Takashi Iwai:
 "Here are a few fixes that have landed after the previous pull request.
  All are driver specific fixes including:

   - error/int value fixes in OXFW,
   - Intel Skylake HD-audio HDMI codec support,
   - Additional HD-audio Realtek codecs and AD1986A codec fixes/quirks,
   - a few more DSD support and a quirk for Arcam rPAC in usb-audio,
   - a typo fix for Scarlett 6i6,
   - fixes for new ASIHPI firmware,
   - ASoC Exynos7 cleanups,
   - Intel ACPI support, and
   - a fix for PCM512 register cache sync"

* tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
  ALSA: hda/realtek - New codec support for ALC298
  ALSA: asihpi: update to HPI version 4.14
  ALSA: asihpi: increase tuner pad cache size
  ALSA: asihpi: relax firmware version check
  ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
  ALSA: hda - Add quirk for Packard Bell EasyNote MX65
  ALSA: usb-audio: add native DSD support for Matrix Audio DACs
  ALSA: hda/realtek - New codec support for ALC256
  ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode
  ASoC: Intel: fix possible acpi enumeration panic
  ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
  ASoC: Intel: fix return value check in sst_acpi_probe()
  ALSA: hda - Make add_stereo_mix_input flag tristate
  ALSA: hda - Create capture source ctls when stereo mix input is added
  ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments
  ALSA: hda - add codec ID for Skylake display audio codec
  ALSA: oxfw: some signedness bugs
  ALSA: oxfw: fix detect_loud_models() return value
  ASoC: rt5677: add REGMAP_I2C and REGMAP_IRQ dependency
  ...

diff --combined sound/soc/samsung/i2s.c
index b1a7c5bce4a169d499cdbe46984f7ad95dc9644b,eca17dc01ef759423ff20459d2d6942783cf8b08..b5a80c528d869e58cbbb58c44ba3cf6a531616ae
--- 1/sound/soc/samsung/i2s.c
--- 2/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@@ -1135,7 -1135,7 +1135,7 @@@ static inline const struct samsung_i2s_
                                platform_get_device_id(pdev)->driver_data;
  }
  
 -#ifdef CONFIG_PM_RUNTIME
 +#ifdef CONFIG_PM
  static int i2s_runtime_suspend(struct device *dev)
  {
        struct i2s_dai *i2s = dev_get_drvdata(dev);
@@@ -1153,7 -1153,7 +1153,7 @@@ static int i2s_runtime_resume(struct de
  
        return 0;
  }
 -#endif /* CONFIG_PM_RUNTIME */
 +#endif /* CONFIG_PM */
  
  static int samsung_i2s_probe(struct platform_device *pdev)
  {
@@@ -1261,6 -1261,8 +1261,8 @@@
                        ret = -ENOMEM;
                        goto err;
                }
+ 
+               sec_dai->variant_regs = pri_dai->variant_regs;
                sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
                sec_dai->dma_playback.ch_name = "tx-sec";
  
@@@ -1470,6 -1472,7 +1472,6 @@@ static struct platform_driver samsung_i
        .id_table = samsung_i2s_driver_ids,
        .driver = {
                .name = "samsung-i2s",
 -              .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(exynos_i2s_match),
                .pm = &samsung_i2s_pm,
        },