38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
From 8c0b4b6a69cf3033eaa93cee7b3a6ca9ce43f572 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <blogic@openwrt.org>
|
||
|
|
Date: Fri, 9 Aug 2013 20:54:31 +0200
|
||
|
|
Subject: [PATCH 30/34] serial: MIPS: lantiq: fix clock error check
|
||
|
|
|
||
|
|
The clock should be checked with the proper IS_ERR() api before using it.
|
||
|
|
|
||
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
||
|
|
---
|
||
|
|
drivers/tty/serial/lantiq.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
|
||
|
|
index 93ac046..88d01e0 100644
|
||
|
|
--- a/drivers/tty/serial/lantiq.c
|
||
|
|
+++ b/drivers/tty/serial/lantiq.c
|
||
|
|
@@ -318,7 +318,7 @@ lqasc_startup(struct uart_port *port)
|
||
|
|
struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
|
||
|
|
int retval;
|
||
|
|
|
||
|
|
- if (ltq_port->clk)
|
||
|
|
+ if (!IS_ERR(ltq_port->clk))
|
||
|
|
clk_enable(ltq_port->clk);
|
||
|
|
port->uartclk = clk_get_rate(ltq_port->fpiclk);
|
||
|
|
|
||
|
|
@@ -386,7 +386,7 @@ lqasc_shutdown(struct uart_port *port)
|
||
|
|
port->membase + LTQ_ASC_RXFCON);
|
||
|
|
ltq_w32_mask(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,
|
||
|
|
port->membase + LTQ_ASC_TXFCON);
|
||
|
|
- if (ltq_port->clk)
|
||
|
|
+ if (!IS_ERR(ltq_port->clk))
|
||
|
|
clk_disable(ltq_port->clk);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|