]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: max310x: set default value when reading clock ready bit
authorHugo Villeneuve <hvilleneuve@dimonoff.com>
Tue, 16 Jan 2024 21:29:58 +0000 (16:29 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Feb 2024 08:51:48 +0000 (09:51 +0100)
commit 0419373333c2f2024966d36261fd82a453281e80 upstream.

If regmap_read() returns a non-zero value, the 'val' variable can be left
uninitialized.

Clear it before calling regmap_read() to make sure we properly detect
the clock ready bit.

Fixes: 4cf9a888fd3c ("serial: max310x: Check the clock readiness")
Cc: stable@vger.kernel.org
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Link: https://lore.kernel.org/r/20240116213001.3691629-2-hugo@hugovil.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/max310x.c

index 97e4965b73d405f821ddfb98df47936f79eae7cf..1b7f84c37096dd0e42578bc0cc287f5557fdf753 100644 (file)
@@ -641,7 +641,7 @@ static u32 max310x_set_ref_clk(struct device *dev, struct max310x_port *s,
 
        /* Wait for crystal */
        if (xtal) {
-               unsigned int val;
+               unsigned int val = 0;
                msleep(10);
                regmap_read(s->regmap, MAX310X_STS_IRQSTS_REG, &val);
                if (!(val & MAX310X_STS_CLKREADY_BIT)) {