---

yaml --- r: 170228 b: refs/heads/master c: c871a05 h: refs/heads/master v: v3
git-mirror · Nov 12, 2009 · acb5234 · acb5234
1 parent da299e9
commit acb5234
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);
 }