diff options
| author | Alan Cox <alan@linux.intel.com> | 2010-10-14 16:59:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 12:11:24 -0700 |
| commit | 83cb1926e0f55d0fd4d3064d1b9bef56bac7fe85 (patch) | |
| tree | 8488339b22aae78ab6e4358485b0ce9ed6dd2e6b /drivers/staging/intel_sst/intelmid.c | |
| parent | 88eea8de94b09207421b75b0029d50727a1dff38 (diff) | |
staging: sst: Remove the aava bits
We don't need these special cases any more.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intelmid.c')
| -rw-r--r-- | drivers/staging/intel_sst/intelmid.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c index 63138b30e14e..4c0264ceaa88 100644 --- a/drivers/staging/intel_sst/intelmid.c +++ b/drivers/staging/intel_sst/intelmid.c @@ -639,7 +639,7 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata) jack = &intelmaddata->jack[3].jack; present = 1; jack_event_flag = 1; - } else { + } else { pr_debug("sst: short press detected\n"); /* send headphone detect/undetect */ jack = &intelmaddata->jack[2].jack; @@ -649,21 +649,8 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata) } } - intelmaddata->jack_prev_state = value ; - - } - if (is_aava() && jack) { - if (present) { - pr_debug("sst: Jack... YES\n"); - scard_ops->set_output_dev(STEREO_HEADPHONE); - - } else { - pr_debug("sst: Jack... NO\n"); - scard_ops->set_output_dev(INTERNAL_SPKR); - - } + intelmaddata->jack_prev_state = value; } - if (jack_event_flag) sst_mad_send_jack_report(jack, buttonpressflag, present); } |