diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 14:19:32 +0000 |
| commit | 4c11a761b8cff3d1941a53ec2a2bb2279ca38b44 (patch) | |
| tree | d321b527b61727afbcf606766a529dc6a36aa7b8 /include/sound | |
| parent | Merge remote-tracking branch 'asoc/topic/io' into asoc-next (diff) | |
| parent | ASoC: delay the initial jack detect by debounce_time (diff) | |
| download | linux-dev-4c11a761b8cff3d1941a53ec2a2bb2279ca38b44.tar.xz linux-dev-4c11a761b8cff3d1941a53ec2a2bb2279ca38b44.zip | |
Merge remote-tracking branch 'asoc/topic/jack' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 59b2a6a6e27c..f7de629728bf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -607,7 +607,8 @@ struct snd_soc_jack_gpio { struct snd_soc_jack *jack; struct delayed_work work; - int (*jack_status_check)(void); + void *data; + int (*jack_status_check)(void *data); }; struct snd_soc_jack { |