From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 9 Jun 2015 05:22:26 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8654844cf51d434dad5d4d9f48dc99d1ac89aad7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' into for-next

Resolve the non-trivial conflict due to the hdac regmap API changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

8654844cf51d434dad5d4d9f48dc99d1ac89aad7
diff --cc sound/pci/hda/hda_codec.c
index 54380ed03697,b7782212dd64..938ee4a6bd3a
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -436,8 -436,9 +436,9 @@@ static unsigned int get_num_devices(str
  	    get_wcaps_type(wcaps) != AC_WID_PIN)
  		return 0;
  
- 	if (_snd_hdac_read_parm(&codec->core, nid, AC_PAR_DEVLIST_LEN, &parm))
- 		return 0; /* error */
+ 	parm = snd_hdac_read_parm_uncached(&codec->core, nid, AC_PAR_DEVLIST_LEN);
 -	if (parm == -1 && codec->bus->rirb_error)
++	if (parm == -1)
+ 		parm = 0;
  	return parm & AC_DEV_LIST_LEN_MASK;
  }
  
diff --cc sound/pci/hda/patch_via.c
index 2c6c6727ca93,bab6c04932aa..0521be8d46a8
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@@ -475,8 -481,10 +484,9 @@@ static const struct hda_codec_ops via_p
  	.init = via_init,
  	.free = via_free,
  	.unsol_event = snd_hda_jack_unsol_event,
 -	.stream_pm = snd_hda_gen_stream_pm,
  #ifdef CONFIG_PM
  	.suspend = via_suspend,
+ 	.resume = via_resume,
  	.check_power_status = via_check_power_status,
  #endif
  };