From patchwork Thu Feb 26 10:05:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sosnowski, Maciej" X-Patchwork-Id: 23762 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 0352EDDE17 for ; Thu, 26 Feb 2009 21:14:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755318AbZBZKNw (ORCPT ); Thu, 26 Feb 2009 05:13:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756191AbZBZKNv (ORCPT ); Thu, 26 Feb 2009 05:13:51 -0500 Received: from mga01.intel.com ([192.55.52.88]:4674 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756192AbZBZKNu (ORCPT ); Thu, 26 Feb 2009 05:13:50 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 26 Feb 2009 02:07:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,270,1233561600"; d="scan'208";a="434322885" Received: from gklab-190-232.igk.intel.com (HELO linux.site) ([172.28.190.232]) by fmsmga002.fm.intel.com with ESMTP; 26 Feb 2009 02:09:38 -0800 From: Maciej Sosnowski Subject: [PATCH 4/7] I/OAT: cancel watchdog before dma remove To: dan.j.williams@intel.com Cc: snakebyte@gmx.de, shannon.nelson@intel.com, jeffrey.t.krisher@intel.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Date: Thu, 26 Feb 2009 11:05:07 +0100 Message-ID: <20090226100502.3615.19068.stgit@linux.site> In-Reply-To: <20090226100327.3615.21419.stgit@linux.site> References: <20090226100327.3615.21419.stgit@linux.site> User-Agent: StGIT/0.13 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Channel watchdog should be canceled before the rest of dma remove stuff. Signed-off-by: Maciej Sosnowski Signed-off-by: Shannon Nelson Acked-by: Jeff Kirsher --- drivers/dma/ioat_dma.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) -- 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/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 9012da7..fc9b845 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c @@ -1705,6 +1705,9 @@ void ioat_dma_remove(struct ioatdma_devi struct dma_chan *chan, *_chan; struct ioat_dma_chan *ioat_chan; + if (device->version != IOAT_VER_3_0) + cancel_delayed_work(&device->work); + ioat_dma_remove_interrupts(device); dma_async_device_unregister(&device->common); @@ -1716,10 +1719,6 @@ void ioat_dma_remove(struct ioatdma_devi pci_release_regions(device->pdev); pci_disable_device(device->pdev); - if (device->version != IOAT_VER_3_0) { - cancel_delayed_work(&device->work); - } - list_for_each_entry_safe(chan, _chan, &device->common.channels, device_node) { ioat_chan = to_ioat_chan(chan);