From da474aeefbd6f40a82bd5e2a01077911fd81563f Mon Sep 17 00:00:00 2001 From: Huang Shijie Date: Thu, 6 Sep 2012 22:38:40 -0400 Subject: [PATCH] --- yaml --- r: 325743 b: refs/heads/master c: 851b714b29db0e394c293170e714f90a778060ad h: refs/heads/master i: 325741: c7f8e630ec65084e552a89911601b1ccb1e7fc25 325739: c3768b9e894dcd81894f917fbcf3476ced183a4d 325735: 6829f24757fd4c9a12d4739a8bcd3d03aec10564 325727: 4e0212d157072cd722ff7762ee0b794b05fb3868 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/mxs-auart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 42e538016786..617711c60aaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37cd0c994fc8ecbfb258c4be2442d9d6f31447ea +refs/heads/master: 851b714b29db0e394c293170e714f90a778060ad diff --git a/trunk/drivers/tty/serial/mxs-auart.c b/trunk/drivers/tty/serial/mxs-auart.c index dafeef2bfb49..ea5f88869cd8 100644 --- a/trunk/drivers/tty/serial/mxs-auart.c +++ b/trunk/drivers/tty/serial/mxs-auart.c @@ -457,11 +457,11 @@ static void mxs_auart_shutdown(struct uart_port *u) writel(AUART_CTRL2_UARTEN, u->membase + AUART_CTRL2_CLR); - writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_SET); - writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN, u->membase + AUART_INTR_CLR); + writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_SET); + clk_disable_unprepare(s->clk); }