From patchwork Mon Aug 3 05:32:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jie.yang@atheros.com X-Patchwork-Id: 30479 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 1994EB7067 for ; Mon, 3 Aug 2009 15:32:53 +1000 (EST) Received: by ozlabs.org (Postfix) id 09946DDDA2; Mon, 3 Aug 2009 15:32:53 +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 80347DDDA0 for ; Mon, 3 Aug 2009 15:32:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751889AbZHCFcS (ORCPT ); Mon, 3 Aug 2009 01:32:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751925AbZHCFcS (ORCPT ); Mon, 3 Aug 2009 01:32:18 -0400 Received: from mail.atheros.com ([12.36.123.2]:55107 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbZHCFcR (ORCPT ); Mon, 3 Aug 2009 01:32:17 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Sun, 02 Aug 2009 22:32:18 -0700 Received: from localhost (10.21.2.182) by SC1EXHC-01.global.atheros.com (10.10.20.111) with Microsoft SMTP Server id 8.0.751.0; Sun, 2 Aug 2009 22:32:17 -0700 From: To: CC: , Subject: atl1c: Do not call cancel_work_sync from the work itself Date: Mon, 3 Aug 2009 13:32:19 +0800 Message-ID: <12492775393830-git-send-email-jie.yang@atheros.com> X-Mailer: git-send-email 1.5.2.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: jie yang @atheros.com --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h index 2a1120a..53242dc 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/drivers/net/atl1c/atl1c.h @@ -427,6 +427,7 @@ struct atl1c_hw { #define ATL1C_ASPM_CTRL_MON 0x0200 #define ATL1C_HIB_DISABLE 0x0400 #define ATL1C_LINK_CAP_1000M 0x0800 +#define ATL1C_RESET_IN_WORK 0x1000 #define ATL1C_FPGA_VERSION 0x8000 u16 cmb_tpd; u16 cmb_rrd; diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 1d601ce..dec88fa 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c @@ -321,7 +321,10 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter) static void atl1c_cancel_work(struct atl1c_adapter *adapter) { - cancel_work_sync(&adapter->reset_task); + if (adapter->hw.ctrl_flags & ATL1C_RESET_IN_WORK) + adapter->hw.ctrl_flags &= ~ATL1C_RESET_IN_WORK;/* clear the flag */ + else + cancel_work_sync(&adapter->reset_task); cancel_work_sync(&adapter->link_chg_task); } @@ -1544,6 +1547,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) /* reset MAC */ hw->intr_mask &= ~ISR_ERROR; AT_WRITE_REG(hw, REG_IMR, hw->intr_mask); + adapter->hw.ctrl_flags |= ATL1C_RESET_IN_WORK; schedule_work(&adapter->reset_task); break; }