]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: rt721-sdca: Fix issue of warning message
authorJack Yu <jack.yu@realtek.com>
Tue, 8 Oct 2024 08:57:36 +0000 (08:57 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 8 Oct 2024 09:49:21 +0000 (10:49 +0100)
Fix issue of warning messages caused by some variables.

Signed-off-by: Jack Yu <jack.yu@realtek.com>
Link: https://patch.msgid.link/065c0b7d84cf47d3a9186235447521c5@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt-sdw-common.c
sound/soc/codecs/rt721-sdca.c

index 9ed0e98556994eba4615f7697a0410d54cfcf338..a422da6cf7026781afd4bb9c1b6df61b194d5e57 100644 (file)
@@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(rt_sdca_index_update_bits);
 int rt_sdca_btn_type(unsigned char *buffer)
 {
        u8 btn_type = 0;
-       int ret;
+       int ret = 0;
 
        btn_type |= buffer[0] & 0xf;
        btn_type |= (buffer[0] >> 4) & 0xf;
index 36056cb7a3ca49d3958d2382ef1b9a6c664cb753..201cb667c8c1db6657fa0aa5d627497e16c7bc53 100644 (file)
@@ -30,7 +30,7 @@ static void rt721_sdca_jack_detect_handler(struct work_struct *work)
 {
        struct rt721_sdca_priv *rt721 =
                container_of(work, struct rt721_sdca_priv, jack_detect_work.work);
-       int btn_type = 0, ret;
+       int btn_type = 0;
 
        if (!rt721->hs_jack)
                return;
@@ -42,7 +42,7 @@ static void rt721_sdca_jack_detect_handler(struct work_struct *work)
        if (rt721->scp_sdca_stat1 & SDW_SCP_SDCA_INT_SDCA_6) {
                rt721->jack_type = rt_sdca_headset_detect(rt721->regmap,
                                                        RT721_SDCA_ENT_GE49);
-               if (ret < 0)
+               if (rt721->jack_type < 0)
                        return;
        }