From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754924AbXJ2Tm1 (ORCPT ); Mon, 29 Oct 2007 15:42:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753100AbXJ2TjT (ORCPT ); Mon, 29 Oct 2007 15:39:19 -0400 Received: from havoc.gtf.org ([69.61.125.42]:34275 "EHLO havoc.gtf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753382AbXJ2TjS (ORCPT ); Mon, 29 Oct 2007 15:39:18 -0400 To: linux-kernel@vger.kernel.org, isdn4linux@listserv.isdn4linux.de Message-Id: In-Reply-To: References: From: Jeff Garzik Cc: kkeil@suse.de, akpm@linux-foundation.org Subject: [PATCH 10/16] [ISDN] HiSax acm_pci: fix module unload Date: Mon, 29 Oct 2007 15:39:09 -0400 (EDT) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jeff Garzik --- drivers/isdn/hisax/avm_pci.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 5fc4c0c..4fd3c0b 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -1015,7 +1015,18 @@ err_out_isa: static void __exit avm_mod_exit(void) { +#ifdef CONFIG_PCI pci_unregister_driver(&avm_pci_driver); +#endif /* CONFIG_PCI */ + +#ifdef CONFIG_ISA + if (avm_irq && avm_io_base) + isa_unregister_driver(&avm_isa_driver); +#ifdef CONFIG_PNP + else + pnp_unregister_driver(&avm_pnp_driver); +#endif /* CONFIG_PNP */ +#endif /* CONFIG_ISA */ } module_init(avm_mod_init); -- 1.5.2.4