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: 31111 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 26870203E6 for ; Thu, 29 May 2014 10:03:57 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf459766iec.8 for ; Thu, 29 May 2014 03:03:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ZbuqGLHJHZ8SKRerMguz9LKDUg2Ahh2kERHBIUAIh6I=; b=MM8P25WYkmPGmIPIwNbiWEFwy4jr7zoG1UXSy49/kEcF4Jz9Xjhf6zd2peM6AByepU ZTXdmFXYCiJxNzmApYTX6Lb/iasYpT3/2A+gxmgMBheN/8XB4Qw/c3O+ulSjzRNfVGXs XxwDU93PLCBntrM7Dh3/lpEZ8U08rEfsXeJjtMJ/s8R04w5Xb8rsXiZrrL0sLrXlxp3Z iT/Uc8WNoDKwLDIm9KQAC78h+Xwd1QisRTIKF9ULrFvreS7b7pr1mxt8WMpResb3dwln JccsGzBDG3uhUt3pmduDyIXrUiIgoLFMYF4BZD71aiU0i4et7yMtLgAf76w7TLwTEZL4 /i/g== X-Gm-Message-State: ALoCoQmngWwdrcBBRcmcP4zkyRUaQv6NU7v6E5V1IWR4Z9arNX4AccRuBgjfBWL18vaG4kBGRugD X-Received: by 10.182.58.71 with SMTP id o7mr2680702obq.3.1401357836407; Thu, 29 May 2014 03:03:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.145 with SMTP id f17ls456802qgd.95.gmail; Thu, 29 May 2014 03:03:56 -0700 (PDT) X-Received: by 10.58.243.198 with SMTP id xa6mr418vec.65.1401357836253; Thu, 29 May 2014 03:03:56 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id u6si86354vdb.89.2014.05.29.03.03.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 May 2014 03:03:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id sa20so111765veb.9 for ; Thu, 29 May 2014 03:03:56 -0700 (PDT) X-Received: by 10.58.169.97 with SMTP id ad1mr723899vec.45.1401357836149; Thu, 29 May 2014 03:03:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp15627vcb; Thu, 29 May 2014 03:03:55 -0700 (PDT) X-Received: by 10.68.237.33 with SMTP id uz1mr7476880pbc.76.1401357835389; Thu, 29 May 2014 03:03:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id li1si215827pab.183.2014.05.29.03.03.54 for ; Thu, 29 May 2014 03:03:54 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757109AbaE2KDr (ORCPT + 27 others); Thu, 29 May 2014 06:03:47 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:35614 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756591AbaE2KDp (ORCPT ); Thu, 29 May 2014 06:03:45 -0400 Received: by mail-wi0-f176.google.com with SMTP id n15so5317636wiw.3 for ; Thu, 29 May 2014 03:03:44 -0700 (PDT) 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 Cc: Daniel Thompson , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, linaro-kernel@lists.linaro.org, Jiri Slaby , Barry Song , Qipan Li , linux-serial@vger.kernel.org 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,