1 files changed, 6 insertions, 3 deletions

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 9f60c25c4568..171c4291ea21 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -315,8 +315,11 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                         goto undo;
                 }
 
-                if (gpios[i].gpiod_dev) {
-                        /* GPIO descriptor */
+                if (gpios[i].desc) {
+                        /* Already have a GPIO descriptor. */
+                        goto got_gpio;
+                } else if (gpios[i].gpiod_dev) {
+                        /* Get a GPIO descriptor */
                         gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev,
                                                         gpios[i].name,
                                                         gpios[i].idx, GPIOD_IN);
@@ -344,7 +347,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
 
                         gpios[i].desc = gpio_to_desc(gpios[i].gpio);
                 }
-
+got_gpio:
                 INIT_DELAYED_WORK(&gpios[i].work, gpio_work);
                 gpios[i].jack = jack;