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

Commit f019ee5f authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Mark Brown
Browse files

ASoC: CX20442: fix NULL pointer dereference 



The CX20442 codec driver never provided the snd_soc_codec_driver's
.reg_cache_default member. With the latest ASoC framework changes, it
seems to be referred unconditionally, resulting in a NULL pointer
dereference if missing. Provide it.

Created and tested on Amstrad Delta against linux-2.6.38-rc2

Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent acd62276

sound/soc/codecs/cx20442.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -367,9 +367,12 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) 
	return 0;

	return 0;

}

}





static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC;



static struct snd_soc_codec_driver cx20442_codec_dev = {

static struct snd_soc_codec_driver cx20442_codec_dev = {

	.probe = 	cx20442_codec_probe,

	.probe = 	cx20442_codec_probe,

	.remove = 	cx20442_codec_remove,

	.remove = 	cx20442_codec_remove,

	.reg_cache_default = &cx20442_reg,

	.reg_cache_size = 1,

	.reg_cache_size = 1,

	.reg_word_size = sizeof(u8),

	.reg_word_size = sizeof(u8),

	.read = cx20442_read_reg_cache,

	.read = cx20442_read_reg_cache,