Commit a5ef8ca6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/arizona' and 'asoc/fix/mtk' into asoc-linus

parents 1a34ec4a 4428ffa1 8d7313bf

sound/soc/codecs/arizona.c

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ const struct soc_enum arizona_anc_input_src[] = { 
			ARRAY_SIZE(arizona_anc_input_src_text),

			arizona_anc_input_src_text),

	SOC_ENUM_SINGLE(ARIZONA_FCL_ADC_REFORMATTER_CONTROL,

			ARIZONA_FCL_MIC_MODE_SEL,

			ARIZONA_FCL_MIC_MODE_SEL_SHIFT,

			ARRAY_SIZE(arizona_anc_channel_src_text),

			arizona_anc_channel_src_text),

	SOC_ENUM_SINGLE(ARIZONA_ANC_SRC,
@@ -718,7 +718,7 @@ const struct soc_enum arizona_anc_input_src[] = { 
			ARRAY_SIZE(arizona_anc_input_src_text),

			arizona_anc_input_src_text),

	SOC_ENUM_SINGLE(ARIZONA_FCR_ADC_REFORMATTER_CONTROL,

			ARIZONA_FCR_MIC_MODE_SEL,

			ARIZONA_FCR_MIC_MODE_SEL_SHIFT,

			ARRAY_SIZE(arizona_anc_channel_src_text),

			arizona_anc_channel_src_text),

};

sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int mt2701_init_clock(struct mtk_base_afe *afe) 


	for (i = 0; i < MT2701_CLOCK_NUM; i++) {

		afe_priv->clocks[i] = devm_clk_get(afe->dev, aud_clks[i]);

		if (IS_ERR(aud_clks[i])) {

		if (IS_ERR(afe_priv->clocks[i])) {

			dev_warn(afe->dev, "%s devm_clk_get %s fail\n",

				 __func__, aud_clks[i]);

			return PTR_ERR(aud_clks[i]);