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

2 files changed, 5 insertions, 3 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 {
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 23d43dac91da..b903f822d1b2 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -250,7 +250,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
                 report = 0;
 
         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);
 }
@@ -342,7 +342,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                 gpio_export(gpios[i].gpio, false);
 
                 /* 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;