From patchwork Thu May 29 10:13:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 4263831 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3434CBF90B for ; Thu, 29 May 2014 10:16:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D855202DD for ; Thu, 29 May 2014 10:16:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 77FF720256 for ; Thu, 29 May 2014 10:16:25 +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 1WpxLj-0000wy-52; Thu, 29 May 2014 10:14:15 +0000 Received: from mail-we0-f182.google.com ([74.125.82.182]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpxLh-0000rd-9e for linux-arm-kernel@lists.infradead.org; Thu, 29 May 2014 10:14:13 +0000 Received: by mail-we0-f182.google.com with SMTP id t60so143748wes.13 for ; Thu, 29 May 2014 03:13:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8lkgNYZlA9k7JKk7xU3Eiko7R+S5i+uPIwwSl66LhII=; b=d8YW8PfrQoME/XivkQIxO8jv0SbyZILjoZ1Farm5SssCoGQcfIkx6pUvQRLd8Odx/5 5U8X5vJFQUFSokoMJkaIbuD8Gzomrd+34u6uVQysFqX+paDJtIqV1Wmqwyb/uYkIcmZM kiVbwrHkl+s6gKCo1i9B8zTqMlcI4eOg45cf+ToS8g08eob7XtC0jutRgjDDYe+xrkwo 4o2kXl5wcbQOnPAg+ve0bcgrlpwZnBXQFsZCHuxVJ8tVuPEpAW6O+qVtsK7V8yupkBR+ mtLBWfsyyafKXOkS3RBrYJgX83kdJStfcn7nuQv4Ll2K9SPlAOInGEgCbJHuCTbYSuwM GH8Q== X-Gm-Message-State: ALoCoQl8FY/KEm2BcNK+XDcNW/1HjnkbdQe5Kn8FJMKhsvDUfuOt/m6+yqdW+q2UoJTAT4WvyP/S X-Received: by 10.194.220.42 with SMTP id pt10mr9194625wjc.60.1401358431084; Thu, 29 May 2014 03:13:51 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id d6sm1627587wiz.4.2014.05.29.03.13.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 May 2014 03:13:50 -0700 (PDT) From: Daniel Thompson To: Greg Kroah-Hartman Subject: [PATCH tty-next] serial: sirf: Fix compilation failure Date: Thu, 29 May 2014 11:13:43 +0100 Message-Id: <1401358423-31532-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1396010535-2654-1-git-send-email-daniel.thompson@linaro.org> References: <1396010535-2654-1-git-send-email-daniel.thompson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140529_031413_483112_92DBC68D X-CRM114-Status: GOOD ( 12.61 ) X-Spam-Score: -0.7 (/) Cc: Daniel Thompson , linaro-kernel@lists.linaro.org, patches@linaro.org, Barry Song , linux-kernel@vger.kernel.org, Qipan Li , linux-serial@vger.kernel.org, Jiri Slaby , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-2.5 required=5.0 tests=BAYES_00,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 After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer possiblet to compile this driver. The rename of one of the spinlocks is faulty. After looking at the original patch I believe this is the correct fix. Compile tested using ARM's multi_v7_defconfig Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Barry Song Cc: Qipan Li Cc: linux-serial@vger.kernel.org Signed-off-by: Daniel Thompson Acked-by: Barry Song --- Notes: Sorry to resend within a few minutes. Patch is identical to parent but the subject line has been corrected. The original 'v6' was just utterly wrong! This patch is a not-previously-shared patch to fix a build regression that appears in tty-next. drivers/tty/serial/sirfsoc_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index 236f892..1f2be48 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -704,7 +704,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param) struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en; unsigned long flags; struct dma_tx_state tx_state; - spin_lock_irqsave(&port->rx_lock, flags); + spin_lock_irqsave(&port->lock, flags); while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan, sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) { sirfsoc_uart_insert_rx_buf_to_tty(sirfport,