From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Fry Subject: [PATCH 2.4.28-rc2-bk3] pcnet32: added pci_disable_device Date: Fri, 12 Nov 2004 11:41:24 -0800 Message-ID: <20041112194124.GA17957@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: To: tsbogend@alpha.franken.de, jgarzik@pobox.com, netdev@oss.sgi.com Content-Disposition: inline Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com List-Id: netdev.vger.kernel.org This patch adds pci_disable_device to disable the device prior to being removed or if the probe fails. Tested ia32. signed-off-by: Don Fry --- linux-2.4.28-rc2-bk3/drivers/net/orig.pcnet32.c 2004-11-12 07:45:37.000000000 -0800 +++ linux-2.4.28-rc2-bk3/drivers/net/pcnet32.c 2004-11-12 09:50:31.000000000 -0800 @@ -1007,7 +1007,11 @@ pcnet32_probe_pci(struct pci_dev *pdev, return -EBUSY; } - return pcnet32_probe1(ioaddr, 1, pdev); + err = pcnet32_probe1(ioaddr, 1, pdev); + if (err < 0) { + pci_disable_device(pdev); + } + return err; } @@ -2241,6 +2245,7 @@ static void __devexit pcnet32_remove_one release_region(dev->base_addr, PCNET32_TOTAL_SIZE); pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr); free_netdev(dev); + pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); } } -- Don Fry brazilnut@us.ibm.com