[PATCH -next] serial: pic32: fix missing clk_disable_unprepare() on error in pic32_uart_startup()

Yang Yingliang posted 1 patch 3 years, 11 months ago
drivers/tty/serial/pic32_uart.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH -next] serial: pic32: fix missing clk_disable_unprepare() on error in pic32_uart_startup()
Posted by Yang Yingliang 3 years, 11 months ago
Fix the missing clk_disable_unprepare() before return
from pic32_uart_startup() in the error handling case.

Fixes: 157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/tty/serial/pic32_uart.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c
index b399aac530fe..f418f1de66b3 100644
--- a/drivers/tty/serial/pic32_uart.c
+++ b/drivers/tty/serial/pic32_uart.c
@@ -503,7 +503,7 @@ static int pic32_uart_startup(struct uart_port *port)
 	if (!sport->irq_fault_name) {
 		dev_err(port->dev, "%s: kasprintf err!", __func__);
 		ret = -ENOMEM;
-		goto out_done;
+		goto out_disable_clk;
 	}
 	irq_set_status_flags(sport->irq_fault, IRQ_NOAUTOEN);
 	ret = request_irq(sport->irq_fault, pic32_uart_fault_interrupt,
@@ -579,6 +579,8 @@ static int pic32_uart_startup(struct uart_port *port)
 out_f:
 	free_irq(sport->irq_fault, port);
 	kfree(sport->irq_fault_name);
+out_disable_clk:
+	clk_disable_unprepare(sport->clk);
 out_done:
 	return ret;
 }
-- 
2.25.1
Re: [PATCH -next] serial: pic32: fix missing clk_disable_unprepare() on error in pic32_uart_startup()
Posted by Jiri Slaby 3 years, 11 months ago
On 25. 05. 22, 4:12, Yang Yingliang wrote:
> Fix the missing clk_disable_unprepare() before return
> from pic32_uart_startup() in the error handling case.
> 
> Fixes: 157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>


Reviewed-by: Jiri Slaby <jirislaby@kernel.org>


> ---
>   drivers/tty/serial/pic32_uart.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c
> index b399aac530fe..f418f1de66b3 100644
> --- a/drivers/tty/serial/pic32_uart.c
> +++ b/drivers/tty/serial/pic32_uart.c
> @@ -503,7 +503,7 @@ static int pic32_uart_startup(struct uart_port *port)
>   	if (!sport->irq_fault_name) {
>   		dev_err(port->dev, "%s: kasprintf err!", __func__);
>   		ret = -ENOMEM;
> -		goto out_done;
> +		goto out_disable_clk;
>   	}
>   	irq_set_status_flags(sport->irq_fault, IRQ_NOAUTOEN);
>   	ret = request_irq(sport->irq_fault, pic32_uart_fault_interrupt,
> @@ -579,6 +579,8 @@ static int pic32_uart_startup(struct uart_port *port)
>   out_f:
>   	free_irq(sport->irq_fault, port);
>   	kfree(sport->irq_fault_name);
> +out_disable_clk:
> +	clk_disable_unprepare(sport->clk);
>   out_done:
>   	return ret;
>   }


-- 
js
suse labs