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

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

Merge branch 'topic/cs42l56' of... 

Merge branch 'topic/cs42l56' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-suspend
parents e649057a a4f87cea

sound/soc/codecs/cs42l56.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -171,9 +171,9 @@ static bool cs42l56_volatile_register(struct device *dev, unsigned int reg) 
{

{

	switch (reg) {

	switch (reg) {

	case CS42L56_INT_STATUS:

	case CS42L56_INT_STATUS:

		return 1;

		return true;

	default:

	default:

		return 0;

		return false;

	}

	}

}

}
@@ -1175,11 +1175,8 @@ static int cs42l56_probe(struct snd_soc_codec *codec) 




static int cs42l56_remove(struct snd_soc_codec *codec)

static int cs42l56_remove(struct snd_soc_codec *codec)

{

{

	struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);



	cs42l56_free_beep(codec);

	cs42l56_free_beep(codec);

	cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);

	cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regulator_bulk_free(ARRAY_SIZE(cs42l56->supplies), cs42l56->supplies);





	return 0;

	return 0;

}

}