Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8560b7c authored by Carlo Caione's avatar Carlo Caione Committed by Mark Brown
Browse files

ASoC: cht_bsw_rt5645: Fix writing to string literal 



We cannot use strcpy() to write to a const char * location. This is
causing a 'BUG: unable to handle kernel paging request' error at boot
when using the cht-bsw-rt5645 driver.

With this patch we also fix a wrong indexing in the driver where the
codec_name of the wrong dai_link is being overwritten.

Signed-off-by: default avatarCarlo Caione <carlo@endlessm.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65b4bcb8

sound/soc/intel/boards/cht_bsw_rt5645.c

+5 −1
Original line number Diff line number Diff line
@@ -367,8 +367,12 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	}

	card->dev = &pdev->dev;

	sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id);



	/* set correct codec name */

	strcpy((char *)card->dai_link[2].codec_name, codec_name);

	for (i = 0; i < ARRAY_SIZE(cht_dailink); i++)

		if (!strcmp(card->dai_link[i].codec_name, "i2c-10EC5645:00"))

			card->dai_link[i].codec_name = kstrdup(codec_name, GFP_KERNEL);



	snd_soc_card_set_drvdata(card, drv);

	ret_val = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret_val) {