From acb523480817a4982099a963554677fd05066675 Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Thu, 12 Nov 2009 17:14:04 +0900 Subject: [PATCH] --- yaml --- r: 170228 b: refs/heads/master c: c871a05315d1a76034ea06feeda92081e1d608bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/sound/soc.h | 2 ++ trunk/sound/soc/soc-jack.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc27362d91e9..fa6eecf38b9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f773205300fa4a5a405f8ed6e3bb97e46c6eefb4 +refs/heads/master: c871a05315d1a76034ea06feeda92081e1d608bf diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index 310a21949a3e..13b117aac5d9 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -332,6 +332,8 @@ struct snd_soc_jack_gpio { int debounce_time; struct snd_soc_jack *jack; struct work_struct work; + + int (*jack_status_check)(void); }; #endif diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c index 12124149601e..3c07a94c2e30 100644 --- a/trunk/sound/soc/soc-jack.c +++ b/trunk/sound/soc/soc-jack.c @@ -163,6 +163,9 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) else report = 0; + if (gpio->jack_status_check) + report = gpio->jack_status_check(); + snd_soc_jack_report(jack, report, gpio->report); }