ramips: update v3.10 patches
[openwrt.git] / target / linux / ramips / patches-3.10 / 0008-serial-MIPS-lantiq-fix-clock-error-check.patch
1 From d94da02421c14fa9295feb218cd45fc01d0f470b Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 8 Aug 2013 17:19:42 +0200
4 Subject: [PATCH 08/25] serial: MIPS: lantiq: fix clock error check
5
6 The clk should be checked with the proper IS_ERR() api before accessing it.
7
8 Signed-off-by: John Crispin <blogic@openwrt.org>
9 ---
10  drivers/tty/serial/lantiq.c |    4 ++--
11  1 file changed, 2 insertions(+), 2 deletions(-)
12
13 --- a/drivers/tty/serial/lantiq.c
14 +++ b/drivers/tty/serial/lantiq.c
15 @@ -318,7 +318,7 @@ lqasc_startup(struct uart_port *port)
16         struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
17         int retval;
18  
19 -       if (ltq_port->clk)
20 +       if (!IS_ERR(ltq_port->clk))
21                 clk_enable(ltq_port->clk);
22         port->uartclk = clk_get_rate(ltq_port->fpiclk);
23  
24 @@ -386,7 +386,7 @@ lqasc_shutdown(struct uart_port *port)
25                 port->membase + LTQ_ASC_RXFCON);
26         ltq_w32_mask(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,
27                 port->membase + LTQ_ASC_TXFCON);
28 -       if (ltq_port->clk)
29 +       if (!IS_ERR(ltq_port->clk))
30                 clk_disable(ltq_port->clk);
31  }
32