From patchwork Thu Sep 18 10:40:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 37586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C4D352054E for ; Thu, 18 Sep 2014 10:41:19 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z11sf424438lbi.6 for ; Thu, 18 Sep 2014 03:41:18 -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=tLMqYgHAlF1SL8ALc+OySqdqp/2zuh0oNtoWaaMu5jw=; b=c3N4EehUAdjlHzFcCzxIoOrmlcjE71MRVjZ91SCMHzumiyzs47G7KVpo41FNRNoh3o iRythhElG/+Dmx9SC1Dzm9lolb65Y0RRSDdD7voI7gCtMCAtFk9ljdrE4ogsGwzKozhV V9AStc8q52vUv8opZGIS9bh5J7imGyYAiXtK6V236jT9QytfkEKvwrsnlIdEXIihGNwL EGN2kmmLe1eN/PttULLgxgwUzBDghNNbOsHIcAnzC/XrWs28kC5hZaZGfT8+zUkjD2hc 8vJVarlvwzj7SjgYl7se+WjwrLtWo3M70bbUCm5E07AuyZSRtWWlSaabUe189NzeLVps 91iA== X-Gm-Message-State: ALoCoQlCrSEXwPVUqytbCxmUF9Lz0OCTc6NamSqcBFxANa2nFXvAlvNZgDF0mHfjjtI1sYo7GmdP X-Received: by 10.180.12.148 with SMTP id y20mr751089wib.7.1411036878502; Thu, 18 Sep 2014 03:41:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.169 with SMTP id s9ls176956laa.47.gmail; Thu, 18 Sep 2014 03:41:18 -0700 (PDT) X-Received: by 10.152.18.199 with SMTP id y7mr4029814lad.0.1411036878313; Thu, 18 Sep 2014 03:41:18 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by mx.google.com with ESMTPS id l3si7728470laf.115.2014.09.18.03.41.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 03:41:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id q1so853016lam.31 for ; Thu, 18 Sep 2014 03:41:18 -0700 (PDT) X-Received: by 10.152.42.136 with SMTP id o8mr3776296lal.71.1411036878103; Thu, 18 Sep 2014 03:41:18 -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.112.130.169 with SMTP id of9csp730376lbb; Thu, 18 Sep 2014 03:41:17 -0700 (PDT) X-Received: by 10.70.22.163 with SMTP id e3mr3963212pdf.157.1411036876451; Thu, 18 Sep 2014 03:41:16 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fu3si39018318pbb.74.2014.09.18.03.41.15 for ; Thu, 18 Sep 2014 03:41:16 -0700 (PDT) Received-SPF: none (google.com: netdev-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 S1756552AbaIRKlM (ORCPT + 3 others); Thu, 18 Sep 2014 06:41:12 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:37879 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755886AbaIRKlK (ORCPT ); Thu, 18 Sep 2014 06:41:10 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XUZ9A-0007hM-F0; Thu, 18 Sep 2014 12:41:08 +0200 From: Marc Kleine-Budde To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-can@vger.kernel.org, kernel@pengutronix.de, Roger Quadros , linux-stable , Marc Kleine-Budde Subject: [PATCH 1/8] can: c_can_platform: fix parameters of c_can_hw_raminit_ti() Date: Thu, 18 Sep 2014 12:40:55 +0200 Message-Id: <1411036862-13255-2-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411036862-13255-1-git-send-email-mkl@pengutronix.de> References: <1411036862-13255-1-git-send-email-mkl@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mkl@pengutronix.de X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 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: , From: Roger Quadros Pass the correct 'mask' and 'value' bits to c_can_hw_raminit_wait_ti(). They seem to have been swapped in the usage instances. Reported-by: Jay Schroeder Signed-off-by: Roger Quadros Cc: linux-stable Signed-off-by: Marc Kleine-Budde --- drivers/net/can/c_can/c_can_platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 109cb44..fb279d6 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -97,14 +97,14 @@ static void c_can_hw_raminit_ti(const struct c_can_priv *priv, bool enable) ctrl |= CAN_RAMINIT_DONE_MASK(priv->instance); writel(ctrl, priv->raminit_ctrlreg); ctrl &= ~CAN_RAMINIT_DONE_MASK(priv->instance); - c_can_hw_raminit_wait_ti(priv, ctrl, mask); + c_can_hw_raminit_wait_ti(priv, mask, ctrl); if (enable) { /* Set start bit and wait for the done bit. */ ctrl |= CAN_RAMINIT_START_MASK(priv->instance); writel(ctrl, priv->raminit_ctrlreg); ctrl |= CAN_RAMINIT_DONE_MASK(priv->instance); - c_can_hw_raminit_wait_ti(priv, ctrl, mask); + c_can_hw_raminit_wait_ti(priv, mask, ctrl); } spin_unlock(&raminit_lock); }