From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523AbbBZHEx (ORCPT ); Thu, 26 Feb 2015 02:04:53 -0500 Received: from nasmtp02.atmel.com ([204.2.163.16]:30942 "EHLO SJOEDG01.corp.atmel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753215AbbBZHEv (ORCPT ); Thu, 26 Feb 2015 02:04:51 -0500 From: Leilei Zhao To: , , , CC: , , Leilei Zhao Subject: [PATCH 1/5] tty/serial: at91: correct check of buf used in DMA Date: Thu, 26 Feb 2015 14:55:21 +0800 Message-ID: <1424933725-16242-2-git-send-email-leilei.zhao@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1424933725-16242-1-git-send-email-leilei.zhao@atmel.com> References: <1424933725-16242-1-git-send-email-leilei.zhao@atmel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We only use buf of ring In DMA rx function while using buf of xmit in DMA tx function. So here we need definitively to check the buf of ring which is corresponding to DMA rx function. Signed-off-by: Leilei Zhao Acked-by: Nicolas Ferre --- drivers/tty/serial/atmel_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 846552b..460903c 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1027,7 +1027,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) spin_lock_init(&atmel_port->lock_rx); sg_init_table(&atmel_port->sg_rx, 1); /* UART circular rx buffer is an aligned page. */ - BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); + BUG_ON((int)ring->buf & ~PAGE_MASK); sg_set_page(&atmel_port->sg_rx, virt_to_page(ring->buf), ATMEL_SERIAL_RINGSIZE, -- 1.7.9.5