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

Commit 65f7e325 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 6c45e126 005967a1

sound/soc/jz4740/jz4740-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream, 
	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	uint32_t conf;



	if (!dai->active)

	if (dai->active)

		return;



	conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);