This is a note to let you know that I've just added the patch titled
serial: 8250_bcm2835aux: Restore clock error handling
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
serial-8250_bcm2835aux-restore-clock-error-handling.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 83e571f054cd742eb9a46d46ef05193904adf53f Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@xxxxxxx>
Date: Wed, 20 Dec 2023 12:43:34 +0100
Subject: serial: 8250_bcm2835aux: Restore clock error handling
From: Stefan Wahren <wahrenst@xxxxxxx>
commit 83e571f054cd742eb9a46d46ef05193904adf53f upstream.
The commit fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support")
dropped the error handling for clock acquiring. But even an optional
clock needs this.
Fixes: fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support")
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Stefan Wahren <wahrenst@xxxxxxx>
Reviewed-by: Florian Fainelli <florian.fainelli@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20231220114334.4712-1-wahrenst@xxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/tty/serial/8250/8250_bcm2835aux.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -119,6 +119,8 @@ static int bcm2835aux_serial_probe(struc
/* get the clock - this also enables the HW */
data->clk = devm_clk_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(data->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(data->clk), "could not get clk\n");
/* get the interrupt */
ret = platform_get_irq(pdev, 0);
Patches currently in stable-queue which might be from wahrenst@xxxxxxx are
queue-6.1/watchdog-bcm2835_wdt-fix-wdioc_settimeout-handling.patch
queue-6.1/serial-8250_bcm2835aux-restore-clock-error-handling.patch
