diff options
| author | NeilBrown <neilb@suse.de> | 2013-02-15 11:29:21 +1100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-03-09 14:51:25 +0100 |
| commit | 6a5c65c7c444ef008da5a253bb78c8aa3233591f (patch) | |
| tree | 87f5a1a52bacae5430a89479dbab2ee482cabfb3 | |
| parent | 042f7b43ae0c4efdb6d9ac4aaa0997bb3970b347 (diff) | |
| download | kernel_goldelico_gta04-6a5c65c7c444ef008da5a253bb78c8aa3233591f.zip kernel_goldelico_gta04-6a5c65c7c444ef008da5a253bb78c8aa3233591f.tar.gz kernel_goldelico_gta04-6a5c65c7c444ef008da5a253bb78c8aa3233591f.tar.bz2 | |
Jack bouncing: bugfix.
If get_madc_conversion returns an error, we should ignore the value.
Reported-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index f49877c..83fb150 100644 --- a/sound/soc/omap/gta04-audio.c +++ b/sound/soc/omap/gta04-audio.c @@ -167,6 +167,8 @@ static void gta04_audio_jack_work(struct work_struct *work) delay = msecs_to_jiffies(50); val = twl4030_get_madc_conversion(7); + if (val < 0) + goto out; /* On my device: * open circuit = around 20 * short circuit = around 800 @@ -199,6 +201,7 @@ static void gta04_audio_jack_work(struct work_struct *work) snd_soc_jack_report(&jack.hs_jack, jackbits, SND_JACK_HEADSET | SND_JACK_BTN_0); +out: if (jack.open) schedule_delayed_work(&jack.jack_work, delay); } |