summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-08-09 20:54:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-12 11:37:48 -0700
commit8ad2ee955b810e2a8061d2d3d2e4e4072250b5ec (patch)
tree2adff5317d7664ed6fbac7fb7c9b1556a8d98e7e
parent7c658e6b46be5d90e6bb668659bb4de6ce80c536 (diff)
downloadlinux-8ad2ee955b810e2a8061d2d3d2e4e4072250b5ec.tar.bz2
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/lantiq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 93ac04686eb9..88d01e0bb0c8 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);
}