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

Commit 2766ee82 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/jack' into asoc-next

parents 8df6bf1c 17665ca4

sound/soc/soc-jack.c

+0 −3
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) 
	struct snd_soc_dapm_context *dapm;

	struct snd_soc_jack_pin *pin;

	int enable;

	int oldstatus;



	trace_snd_soc_jack_report(jack, mask, status);
@@ -78,8 +77,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) 


	mutex_lock(&jack->mutex);



	oldstatus = jack->status;



	jack->status &= ~mask;

	jack->status |= status & mask;