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: 31112 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 79691203E6 for ; Thu, 29 May 2014 10:13:56 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf614489igq.6 for ; Thu, 29 May 2014 03:13:55 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=uZPU06NI7arafot71dp3EWqR8A1MSbur+F3LWinfCRs=; b=Lwv7qothIDp1OtYjfRTwH8ogGbl9ggif7UaSTPfcNsk0Re64L1Qty6dJ2WbirlalQw X2w999hrUBUBpl2Bj9T2djLHBu2XcW3gBSiHc/WpGc5U7l/ZpvMyWltDuKvbJsBgTdHf C9iNXDltdV5bYOQ1Qtg6mMfCb+jg42W33ARn+RcJm9abk/coM0W7JNXiwXfTi3s5+sb0 vXb/cq94BbWFjYQJvhZjh2sJH6hgu6pMQIS2D4cf0lWnllZdEJUt4BAPaXEh2ClCnswU lPtV4lCotYzP5Q4ke4TrNBEqXNKFPAiMMQaw1br3XyBWNsz78LHSI/ZrAh098a3yUJLK yd6g== X-Gm-Message-State: ALoCoQn1OCiivDzGKF+TgS5xt5WIGgoeeDaEiMhLsQXSFkkzPcrQYDZiWwLCQwSryecyKECDTjFI X-Received: by 10.182.128.166 with SMTP id np6mr2697016obb.16.1401358435351; Thu, 29 May 2014 03:13:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.52 with SMTP id n49ls472991qge.29.gmail; Thu, 29 May 2014 03:13:55 -0700 (PDT) X-Received: by 10.220.69.72 with SMTP id y8mr5341535vci.21.1401358435256; Thu, 29 May 2014 03:13:55 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id oh5si119458vcb.6.2014.05.29.03.13.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 May 2014 03:13:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lc6so119845vcb.2 for ; Thu, 29 May 2014 03:13:55 -0700 (PDT) X-Received: by 10.58.121.39 with SMTP id lh7mr43454veb.62.1401358435116; Thu, 29 May 2014 03:13:55 -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 ib8csp16216vcb; Thu, 29 May 2014 03:13:54 -0700 (PDT) X-Received: by 10.66.158.132 with SMTP id wu4mr7663732pab.66.1401358434336; Thu, 29 May 2014 03:13:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id py7si209631pbb.251.2014.05.29.03.13.54; Thu, 29 May 2014 03:13:54 -0700 (PDT) Received-SPF: none (google.com: linux-serial-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 S1752982AbaE2KNx (ORCPT + 2 others); Thu, 29 May 2014 06:13:53 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:36472 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbaE2KNw (ORCPT ); Thu, 29 May 2014 06:13:52 -0400 Received: by mail-we0-f178.google.com with SMTP id u56so137168wes.23 for ; Thu, 29 May 2014 03:13:51 -0700 (PDT) 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 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 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> Sender: linux-serial-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-serial@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.220.171 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 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,