evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'asoc/topic/jack' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2014-03-13 14:19:32 +00:00
commit 4c11a761b8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sound/soc.h
View file

@ -607,7 +607,8 @@ struct snd_soc_jack_gpio {
struct snd_soc_jack *jack; struct snd_soc_jack *jack;
struct delayed_work work; struct delayed_work work;
int (*jack_status_check)(void); void *data;
int (*jack_status_check)(void *data);
}; };
struct snd_soc_jack { struct snd_soc_jack {

5
sound/soc/soc-jack.c
View file

@ -250,7 +250,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
report = 0; report = 0;
if (gpio->jack_status_check) if (gpio->jack_status_check)
report = gpio->jack_status_check(); report = gpio->jack_status_check(gpio->data);
snd_soc_jack_report(jack, report, gpio->report); snd_soc_jack_report(jack, report, gpio->report);
} }
@ -342,7 +342,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
gpio_export(gpios[i].gpio, false); gpio_export(gpios[i].gpio, false);
/* Update initial jack status */ /* Update initial jack status */
snd_soc_jack_gpio_detect(&gpios[i]); schedule_delayed_work(&gpios[i].work,
msecs_to_jiffies(gpios[i].debounce_time));
} }
return 0; return 0;