Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
This commit is contained in:
commit
2766ee82b2
1 changed files with 0 additions and 3 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue