Merge branch 'fix/hda' into for-linus (de2cf591) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/pci/hda/patch_conexant.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -347,6 +347,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
		&spec->cur_mux[adc_idx]);
		}

		#ifdef CONFIG_SND_JACK
		static int conexant_add_jack(struct hda_codec *codec,
		hda_nid_t nid, int type)
		{
		@@ -394,7 +395,6 @@ static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)

		static int conexant_init_jacks(struct hda_codec *codec)
		{
		#ifdef CONFIG_SND_JACK
		struct conexant_spec *spec = codec->spec;
		int i;

		@@ -422,10 +422,19 @@ static int conexant_init_jacks(struct hda_codec *codec)
		++hv;
		}
		}
		#endif
		return 0;

		}
		#else
		static inline void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
		{
		}

		static inline int conexant_init_jacks(struct hda_codec *codec)
		{
		return 0;
		}
		#endif

		static int conexant_init(struct hda_codec *codec)
		{
		@@ -1566,6 +1575,7 @@ static struct snd_pci_quirk cxt5047_cfg_tbl[] = {
		SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
		SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),
		SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", CXT5047_LAPTOP),
		SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6700", CXT5047_LAPTOP),
		SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),
		{}
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -7018,6 +7018,7 @@ static int patch_alc882(struct hda_codec *codec)
		case 0x106b00a4: /* MacbookPro4,1 */
		case 0x106b2c00: /* Macbook Pro rev3 */
		case 0x106b3600: /* Macbook 3.1 */
		case 0x106b3800: /* MacbookPro4,1 - latter revision */
		board_config = ALC885_MBP3;
		break;
		default:

+2 −0

Original line number	Diff line number	Diff line
		@@ -2539,6 +2539,8 @@ static int stac92xx_build_pcms(struct hda_codec *codec)

		info->name = "STAC92xx Analog";
		info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
		info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
		spec->multiout.dac_nids[0];
		info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
		info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
		info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adcs;