rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Merge "ASoC: jack: Push locking for jacks down to the jack"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-11-17 19:51:38 -08:00
committed by Gerrit - the friendly Code Review server
parent 14ee7bc28f b7405cfa71
commit 5ef0fad0d9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/soc.h
+1
View File
@@ -561,6 +561,7 @@ struct snd_soc_jack_gpio {
#endif
struct snd_soc_jack {
struct mutex mutex;
struct snd_jack *jack;
struct snd_soc_codec *codec;
struct list_head pins;
sound/soc/soc-jack.c
+3 -2
View File
@@ -36,6 +36,7 @@
int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
struct snd_soc_jack *jack)
{
mutex_init(&jack->mutex);
jack->codec = codec;
INIT_LIST_HEAD(&jack->pins);
INIT_LIST_HEAD(&jack->jack_zones);
@@ -75,7 +76,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
codec = jack->codec;
dapm = &codec->dapm;
mutex_lock(&codec->mutex);
mutex_lock(&jack->mutex);
oldstatus = jack->status;
@@ -109,7 +110,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
snd_jack_report(jack->jack, jack->status);
out:
mutex_unlock(&codec->mutex);
mutex_unlock(&jack->mutex);
}
EXPORT_SYMBOL_GPL(snd_soc_jack_report);