From patchwork Fri Oct 23 10:00:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 7471381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71726BEEA4 for ; Fri, 23 Oct 2015 10:02:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE0F02083E for ; Fri, 23 Oct 2015 10:02:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D41B20667 for ; Fri, 23 Oct 2015 10:02:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZpZ9K-0001JD-NQ; Fri, 23 Oct 2015 10:00:38 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([207.82.80.143]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZpZ9H-00018A-3o for linux-arm-kernel@lists.infradead.org; Fri, 23 Oct 2015 10:00:36 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-20-5Z7q04RpQwiDcBwSVuSswA-1; Fri, 23 Oct 2015 11:00:06 +0100 Received: from Huang.asiapac.arm.com ([10.1.2.79]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 Oct 2015 11:00:05 +0100 From: Huang Shijie To: gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] Revert "serial: amba-pl011: fix incorrect integer size in pl011_fifo_to_tty()" Date: Fri, 23 Oct 2015 18:00:00 +0800 Message-Id: <1445594400-29095-1-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.1.4 X-OriginalArrivalTime: 23 Oct 2015 10:00:05.0355 (UTC) FILETIME=[9772EBB0:01D10D79] X-MC-Unique: 5Z7q04RpQwiDcBwSVuSswA-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151023_030035_532767_9697CAF1 X-CRM114-Status: UNSURE ( 7.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huang Shijie , timur@codeaurora.org, Dave.Martin@arm.com, linux-serial@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit 71a5cd8a4 makes the console hang for some times. This reverts commit 71a5cd8a4a2602a6e9010b557a23af0a54df87b6. Signed-off-by: Huang Shijie --- drivers/tty/serial/amba-pl011.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 899a771..fd27e98 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -191,8 +191,8 @@ struct uart_amba_port { */ static int pl011_fifo_to_tty(struct uart_amba_port *uap) { - u16 status; - unsigned int ch, flag, max_count = 256; + u16 status, ch; + unsigned int flag, max_count = 256; int fifotaken = 0; while (max_count--) {