From patchwork Thu May 29 10:03:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 4263811 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 689C5BF90B for ; Thu, 29 May 2014 10:06:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A400201FB for ; Thu, 29 May 2014 10:06:47 +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 58CB020340 for ; Thu, 29 May 2014 10:06:44 +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 1WpxBx-0003ho-CU; Thu, 29 May 2014 10:04:09 +0000 Received: from mail-wg0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpxBv-0003ff-1F for linux-arm-kernel@lists.infradead.org; Thu, 29 May 2014 10:04:07 +0000 Received: by mail-wg0-f47.google.com with SMTP id x12so124034wgg.30 for ; Thu, 29 May 2014 03:03:44 -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; bh=upHjMnj/gH9N8+4rw/7bpc/xVp+GlqfkIkompOvbgfM=; b=AvWdwwXT+tED96SAXO/O5a0RR7i0NFF17yTer+W3W8tWIals6lYsY2tMMSoDWpxxn3 AavzHW3fUm9rm9hxGsocc7EDvlzVafVmTEc/dS3ZVGfdVC3hAT4QFcUvitLDgCClMWYb 1vNL1K5LOK8r9ollyCnUXmkFvooShySoyucuyNGvfUCSNjvxD5lElSP6rtfcH0uq1VJ4 oxPy+Om9xcxovnSLxX2zjPPiQsLv5QbjYgWrH0baPK5g0agInxwJ1AMLf+9nFUgugWMu CMAeQjsVx/aQfuNwPFjaoZU0jze4urvn6YjiK5/BJJeQg/AuA6F0qTAtCKriLJRpR9/a MjlQ== X-Gm-Message-State: ALoCoQnC+w+O6WK5lYVHac/4df53v5umyT6lXBMWtgXG3Hq5gcVyBI17bcX0O2b2ZTzOq0ovmKGg X-Received: by 10.180.78.5 with SMTP id x5mr58727393wiw.12.1401357824340; Thu, 29 May 2014 03:03:44 -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 lz11sm24421338wic.0.2014.05.29.03.03.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 May 2014 03:03:43 -0700 (PDT) From: Daniel Thompson To: Greg Kroah-Hartman Subject: [PATCH v6] serial: sirf: Fix compilation failure Date: Thu, 29 May 2014 11:03:34 +0100 Message-Id: <1401357814-15772-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140529_030407_220230_7410A189 X-CRM114-Status: GOOD ( 10.68 ) 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 --- 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,