OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2012-12-10 00:22:11 +09:00
parent 8df6bf1c58 17665ca441
commit 2766ee82b2
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_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;