From patchwork Sat Dec 1 12:42:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 203132 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2E2522C009B for ; Sat, 1 Dec 2012 23:42:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751661Ab2LAMmo (ORCPT ); Sat, 1 Dec 2012 07:42:44 -0500 Received: from mailout-de.gmx.net ([213.165.64.22]:40755 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751423Ab2LAMmo (ORCPT ); Sat, 1 Dec 2012 07:42:44 -0500 Received: (qmail invoked by alias); 01 Dec 2012 12:42:42 -0000 Received: from HSI-KBW-134-3-156-158.hsi14.kabel-badenwuerttemberg.de (EHLO neptun) [134.3.156.158] by mail.gmx.net (mp036) with SMTP; 01 Dec 2012 13:42:42 +0100 X-Authenticated: #4630777 X-Provags-ID: V01U2FsdGVkX19BNqQMiUVB/pjv3hT5geXpGWXViDrTE6tWCG4Twe 2gQfdl+/BHOJ/D Date: Sat, 1 Dec 2012 13:42:39 +0100 From: Lino Sanfilippo To: shemminger@vyatta.com, mlindner@marvell.com Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: sky2: Correct mistakenly switched read/write sequence Message-ID: <20121201124239.GB3914@neptun> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Y-GMX-Trusted: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In sky2_all_down() the order of the read()/write() access to B0_IMSK seems to be mistakenly switched. The original intention was obviously to avoid PCI write posting. This patch fixes the order. Signed-off-by: Lino Sanfilippo --- drivers/net/ethernet/marvell/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 78946fe..b20d2fd 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -3481,8 +3481,8 @@ static void sky2_all_down(struct sky2_hw *hw) int i; if (hw->flags & SKY2_HW_IRQ_SETUP) { - sky2_read32(hw, B0_IMSK); sky2_write32(hw, B0_IMSK, 0); + sky2_read32(hw, B0_IMSK); synchronize_irq(hw->pdev->irq); napi_disable(&hw->napi);