From c49ba2880c1b41973adf4d5b47609acd803a2ad3 Mon Sep 17 00:00:00 2001 From: Steffen Trumtrar Date: Fri, 22 Mar 2013 18:50:02 +0100 Subject: [PATCH] --- yaml --- r: 364282 b: refs/heads/master c: 30215c3b8f36cc532267615ceade3657a9bd9563 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/xilinx_uartps.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52ded7198869..f7b97066b00b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b250a6b0015753362eeb63c3a0dd985848ed772d +refs/heads/master: 30215c3b8f36cc532267615ceade3657a9bd9563 diff --git a/trunk/drivers/tty/serial/xilinx_uartps.c b/trunk/drivers/tty/serial/xilinx_uartps.c index ba451c7209fc..974c361a91fe 100644 --- a/trunk/drivers/tty/serial/xilinx_uartps.c +++ b/trunk/drivers/tty/serial/xilinx_uartps.c @@ -583,9 +583,6 @@ static int xuartps_startup(struct uart_port *port) xuartps_writel(XUARTPS_IXR_TXEMPTY | XUARTPS_IXR_PARITY | XUARTPS_IXR_FRAMING | XUARTPS_IXR_OVERRUN | XUARTPS_IXR_RXTRIG | XUARTPS_IXR_TOUT, XUARTPS_IER_OFFSET); - xuartps_writel(~(XUARTPS_IXR_TXEMPTY | XUARTPS_IXR_PARITY | - XUARTPS_IXR_FRAMING | XUARTPS_IXR_OVERRUN | - XUARTPS_IXR_RXTRIG | XUARTPS_IXR_TOUT), XUARTPS_IDR_OFFSET); return retval; }