diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-14 19:25:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-15 11:44:43 +0000 |
| commit | f9a67059d43a8f12446356ed42d7694afc34bb92 (patch) | |
| tree | c986b44b9b23214122f028f0cda4fafcff80391f /sound/soc/soc-jack.c | |
| parent | cb2b3cf1fedd31916b7c64d61e2d20d23bd3681a (diff) | |
| download | op-kernel-dev-f9a67059d43a8f12446356ed42d7694afc34bb92.zip op-kernel-dev-f9a67059d43a8f12446356ed42d7694afc34bb92.tar.gz | |
ASoC: Prevent system suspend while debouncing wakeup capable GPIO jacks
If the device associated with a GPIO jack is wakeup capable then disable
suspend while we're debouncing the jack so that we skip suspends that race
with the jack.
Note that currently the GPIO based jack has a CODEC associated with it
which we're using right now. These jacks should be reparented against the
card itself and this code adjusted.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 4d95abb..619061d 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -209,6 +209,10 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) static irqreturn_t gpio_handler(int irq, void *data) { struct snd_soc_jack_gpio *gpio = data; + struct device *dev = gpio->jack->codec->card->dev; + + if (device_may_wakeup(dev)) + pm_wakeup_event(dev, gpio->debounce_time + 50); schedule_delayed_work(&gpio->work, msecs_to_jiffies(gpio->debounce_time)); |
