]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: SDCA: Fix bad move of jack_state initialisation
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Tue, 5 May 2026 09:08:11 +0000 (10:08 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 5 May 2026 12:06:41 +0000 (21:06 +0900)
The initialisation of jack_state was accidentally moved until after its
use, correct this.

Fixes: cb3c257e0824 ("ASoC: SDCA: Add correct masks whilst reporting SDCA jack status")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260505090811.3697153-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sdca/sdca_jack.c

index a2d95b124b789337c231f5f77ddb914df855b935..ae9636622a840246de6650b113b7f670b59882c3 100644 (file)
@@ -203,6 +203,8 @@ int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *ja
                        if (!range)
                                return -EINVAL;
 
+                       jack_state = interrupt->priv;
+
                        for (j = 0; j < range->rows; j++) {
                                enum sdca_terminal_type type;
 
@@ -211,7 +213,6 @@ int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *ja
                                jack_state->mask |= type_get_mask(type);
                        }
 
-                       jack_state = interrupt->priv;
                        jack_state->jack = jack;
 
                        /* Report initial state in case IRQ was already handled */