1 files changed, 3 insertions, 2 deletions

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;