Skip to content

Commit 0aa9e51

Browse files
committed
Merge branch 'for-linus' into for-next
Merge the last-piece from 6.16 devel branch to sync the code base. Signed-off-by: Takashi Iwai <[email protected]>
2 parents ab29b34 + 0d57ed9 commit 0aa9e51

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

sound/soc/codecs/rt5645.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static const struct reg_sequence rt5650_init_list[] = {
8282
{0xf6, 0x0100},
8383
{RT5645_PWR_ANLG1, 0x02},
8484
{RT5645_IL_CMD3, 0x6728},
85+
{RT5645_PR_BASE + 0x3a, 0x0000},
8586
};
8687

8788
static const struct reg_default rt5645_reg[] = {

sound/soc/mediatek/common/mtk-soundcard-driver.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,13 @@ int mtk_soundcard_common_probe(struct platform_device *pdev)
262262
soc_card_data->accdet = accdet_comp;
263263
else
264264
dev_err(&pdev->dev, "No sound component found from mediatek,accdet property\n");
265+
266+
put_device(&accdet_pdev->dev);
265267
} else {
266268
dev_err(&pdev->dev, "No device found from mediatek,accdet property\n");
267269
}
270+
271+
of_node_put(accdet_node);
268272
}
269273

270274
platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);

sound/soc/mediatek/mt8365/mt8365-dai-i2s.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -812,11 +812,10 @@ static const struct snd_soc_dapm_route mtk_dai_i2s_routes[] = {
812812
static int mt8365_dai_i2s_set_priv(struct mtk_base_afe *afe)
813813
{
814814
int i, ret;
815-
struct mt8365_afe_private *afe_priv = afe->platform_priv;
816815

817816
for (i = 0; i < DAI_I2S_NUM; i++) {
818817
ret = mt8365_dai_set_priv(afe, mt8365_i2s_priv[i].id,
819-
sizeof(*afe_priv),
818+
sizeof(mt8365_i2s_priv[i]),
820819
&mt8365_i2s_priv[i]);
821820
if (ret)
822821
return ret;

sound/soc/sdca/sdca_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static int find_sdca_init_table(struct device *dev,
211211
} else if (num_init_writes % sizeof(*raw) != 0) {
212212
dev_err(dev, "%pfwP: init table size invalid\n", function_node);
213213
return -EINVAL;
214-
} else if (num_init_writes > SDCA_MAX_INIT_COUNT) {
214+
} else if ((num_init_writes / sizeof(*raw)) > SDCA_MAX_INIT_COUNT) {
215215
dev_err(dev, "%pfwP: maximum init table size exceeded\n", function_node);
216216
return -EINVAL;
217217
}

sound/soc/sof/intel/ptl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ const struct sof_intel_dsp_desc ptl_chip_info = {
117117
.read_sdw_lcount = hda_sdw_check_lcount_ext,
118118
.check_sdw_irq = lnl_dsp_check_sdw_irq,
119119
.check_sdw_wakeen_irq = lnl_sdw_check_wakeen_irq,
120+
.sdw_process_wakeen = hda_sdw_process_wakeen_common,
120121
.check_ipc_irq = mtl_dsp_check_ipc_irq,
121122
.check_mic_privacy_irq = sof_ptl_check_mic_privacy_irq,
122123
.process_mic_privacy = sof_ptl_process_mic_privacy,

0 commit comments

Comments
 (0)