From patchwork Wed May 6 09:22:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 26901 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id DEE0DB6F35 for ; Wed, 6 May 2009 19:28:30 +1000 (EST) Received: by ozlabs.org (Postfix) id CD226DDDF3; Wed, 6 May 2009 19:28:30 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5BE03DDDB2 for ; Wed, 6 May 2009 19:28:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753716AbZEFJ2W (ORCPT ); Wed, 6 May 2009 05:28:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753502AbZEFJ2W (ORCPT ); Wed, 6 May 2009 05:28:22 -0400 Received: from mx2.redhat.com ([66.187.237.31]:35055 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753184AbZEFJ2V (ORCPT ); Wed, 6 May 2009 05:28:21 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n469SM7i021714; Wed, 6 May 2009 05:28:22 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n469SMr8030891; Wed, 6 May 2009 05:28:22 -0400 Received: from dhcp-lab-109.englab.brq.redhat.com (dhcp-lab-109.englab.brq.redhat.com [10.34.33.109]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n469SK1X004212; Wed, 6 May 2009 05:28:21 -0400 Date: Wed, 6 May 2009 11:22:07 +0200 From: Stanislaw Gruszka To: "netdev@vger.kernel.org" Cc: Eilon Greenstein Subject: [PATCH 2/3] bnx2x: assure we release PHY lock only when is taken Message-ID: <20090506112207.4d3ae9c4@dhcp-lab-109.englab.brq.redhat.com> Organization: RedHat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stanislaw Gruszka --- drivers/net/bnx2x_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index ff2d9f6..5bd42db 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -2585,10 +2585,11 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted) REG_WR(bp, hc_addr, asserted); /* now set back the mask */ - if (asserted & ATTN_NIG_FOR_FUNC) { - REG_WR(bp, nig_int_mask_addr, nig_mask); - bnx2x_release_phy_lock(bp); - } + if (asserted & ATTN_HARD_WIRED_MASK) + if (asserted & ATTN_NIG_FOR_FUNC) { + REG_WR(bp, nig_int_mask_addr, nig_mask); + bnx2x_release_phy_lock(bp); + } } static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)