[PATCH] serial: 8250_bcm2835aux: Restore clock error handling
Jeremy Linton
jeremy.linton at arm.com
Tue Jan 9 16:01:58 PST 2024
Hi,
On 12/20/23 05:43, Stefan Wahren wrote:
> The commit fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support")
> dropped the error handling for clock acquiring. But even an optional
> clock needs this.
Right, the call was changed to _optional() during review but the error
handling didn't get put back.
>
> Fixes: fcc446c8aa63 ("serial: 8250_bcm2835aux: Add ACPI support")
> Signed-off-by: Stefan Wahren <wahrenst at gmx.net>
> ---
> drivers/tty/serial/8250/8250_bcm2835aux.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
> index 15a2387a5b25..4f4502fb5454 100644
> --- 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(struct platform_device *pdev)
>
> /* 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);
> --
And on ACPI machines it returns NULL, which passes the error check now,
so it works on an ACPI based pi.
Thanks!
Reviewed-by: Jeremy Linton <jeremy.linton at arm.com>
Tested-by: Jeremy Linton <jeremy.linton at arm.com>
More information about the linux-arm-kernel
mailing list