Commit 092a9f59 authored Apr 30, 2020 by Florian Fainelli Committed by Greg Kroah-Hartman May 04, 2020

Revert "tty: serial: bcm63xx: fix missing clk_put() in bcm63xx_uart"



This reverts commit 580d952e ("tty:
serial: bcm63xx: fix missing clk_put() in bcm63xx_uart") because we
should not be doing a clk_put() if we were not successful in getting a
valid clock reference via clk_get() in the first place.

Fixes: 580d952e ("tty: serial: bcm63xx: fix missing clk_put() in bcm63xx_uart")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200501013904.1394-1-f.fainelli@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6a8b55ed

drivers/tty/serial/bcm63xx_uart.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -843,10 +843,8 @@ static int bcm_uart_probe(struct platform_device *pdev)
		if (IS_ERR(clk) && pdev->dev.of_node)
		clk = of_clk_get(pdev->dev.of_node, 0);

		if (IS_ERR(clk)) {
		clk_put(clk);
		if (IS_ERR(clk))
		return -ENODEV;
		}

		port->iotype = UPIO_MEM;
		port->irq = res_irq->start;

Admin message