evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2012-12-02 13:35:06 +09:00
commit 81467c3325
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/soc-jack.c
View file

@ -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_dapm_context *dapm;
struct snd_soc_jack_pin *pin; struct snd_soc_jack_pin *pin;
int enable; int enable;
int oldstatus;
trace_snd_soc_jack_report(jack, mask, status); 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); mutex_lock(&jack->mutex);
oldstatus = jack->status;
jack->status &= ~mask; jack->status &= ~mask;
jack->status |= status & mask; jack->status |= status & mask;